From e6dc8d60fbd2c84900a26545c5d360b0e202d95b Mon Sep 17 00:00:00 2001 From: Andy Parkins Date: Fri, 28 Sep 2007 15:24:26 +0100 Subject: [PATCH 1/3] post-receive-hook: Remove the From field from the generated email header so that the pusher's name is used Using the name of the committer of the revision at the tip of the updated ref is not sensible. That information is available in the email itself should it be wanted, and by supplying a "From", we were effectively hiding the person who performed the push - which is useful information in itself. Signed-off-by: Andy Parkins Signed-off-by: Junio C Hamano --- contrib/hooks/post-receive-email | 1 - 1 file changed, 1 deletion(-) diff --git a/contrib/hooks/post-receive-email b/contrib/hooks/post-receive-email index 1f88099df4b..cbbd02fadd7 100644 --- a/contrib/hooks/post-receive-email +++ b/contrib/hooks/post-receive-email @@ -177,7 +177,6 @@ generate_email_header() # --- Email (all stdout will be the email) # Generate header cat <<-EOF - From: $committer To: $recipients Subject: ${EMAILPREFIX}$projectdesc $refname_type, $short_refname, ${change_type}d. $describe X-Git-Refname: $refname From 0bdcac5666170547dc7882cc1d39b0481206074b Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Mon, 1 Oct 2007 00:30:27 +0200 Subject: [PATCH 2/3] git stash: document apply's --index switch Signed-off-by: Junio C Hamano --- Documentation/git-stash.txt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Documentation/git-stash.txt b/Documentation/git-stash.txt index 05f40cff6cb..5723bb06f08 100644 --- a/Documentation/git-stash.txt +++ b/Documentation/git-stash.txt @@ -63,7 +63,7 @@ show []:: it will accept any format known to `git-diff` (e.g., `git-stash show -p stash@\{1}` to view the second most recent stash in patch form). -apply []:: +apply [--index] []:: Restore the changes recorded in the stash on top of the current working tree state. When no `` is given, applies the latest @@ -71,6 +71,11 @@ apply []:: + This operation can fail with conflicts; you need to resolve them by hand in the working tree. ++ +If the `--index` option is used, then tries to reinstate not only the working +tree's changes, but also the index's ones. However, this can fail, when you +have conflicts (which are stored in the index, where you therefore can no +longer apply the changes as they were originally). clear:: Remove all the stashed states. Note that those states will then From 5946d4ba8970f00bb62b2c9e8714264831034043 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 1 Oct 2007 02:07:47 -0700 Subject: [PATCH 3/3] Whip post 1.5.3.3 maintenance series into shape. Signed-off-by: Junio C Hamano --- Documentation/RelNotes-1.5.3.3.txt | 6 ------ Documentation/RelNotes-1.5.3.4.txt | 28 ++++++++++++++++++++++++++++ GIT-VERSION-GEN | 2 +- RelNotes | 2 +- 4 files changed, 30 insertions(+), 8 deletions(-) create mode 100644 Documentation/RelNotes-1.5.3.4.txt diff --git a/Documentation/RelNotes-1.5.3.3.txt b/Documentation/RelNotes-1.5.3.3.txt index e91bd841624..2a7bfdd5cc7 100644 --- a/Documentation/RelNotes-1.5.3.3.txt +++ b/Documentation/RelNotes-1.5.3.3.txt @@ -29,9 +29,3 @@ Fixes since v1.5.3.2 * git-log sometimes invoked underlying "diff" machinery unnecessarily. - --- -exec >/var/tmp/1 -O=v1.5.3.2-29-gb7bb760 -echo O=`git describe refs/heads/maint` -git shortlog --no-merges $O..refs/heads/maint diff --git a/Documentation/RelNotes-1.5.3.4.txt b/Documentation/RelNotes-1.5.3.4.txt new file mode 100644 index 00000000000..47ba2870a28 --- /dev/null +++ b/Documentation/RelNotes-1.5.3.4.txt @@ -0,0 +1,28 @@ +GIT v1.5.3.4 Release Notes +========================== + +Fixes since v1.5.3.3 +-------------------- + + * Sample 'post-receive-hook' incorrectly sent out push + notification e-mails marked as "From: " the committer of the + commit that happened to be at the tip of the branch that was + pushed, not from the person who pushed. + + * git-remote did not exit non-zero status upon error. + + * "git-add -i" did not respond very well to EOF from tty nor + bogus input. + + * "git rebase -i" squash subcommand incorrectly made the + author of later commit the author of resulting commit, + instead of taking from the first one in the squashed series. + + * "git stash apply --index" was not documented. + + +-- +exec >/var/tmp/1 +O=v1.5.3.3-6-g0bdcac5 +echo O=`git describe refs/heads/maint` +git shortlog --no-merges $O..refs/heads/maint diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index 7fbde233b86..6de899a4659 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -1,7 +1,7 @@ #!/bin/sh GVF=GIT-VERSION-FILE -DEF_VER=v1.5.3.2.GIT +DEF_VER=v1.5.3.3.GIT LF=' ' diff --git a/RelNotes b/RelNotes index 44b610e8f89..9829b436cbb 120000 --- a/RelNotes +++ b/RelNotes @@ -1 +1 @@ -Documentation/RelNotes-1.5.3.3.txt \ No newline at end of file +Documentation/RelNotes-1.5.3.4.txt \ No newline at end of file