summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-02-27 23:37:02 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-02-27 23:37:02 (GMT)
commit25a7850a106ed0f27b88b8ce0b89fd326120dff4 (patch)
treea9928a82c3a2f58018e80426d3a45d956590ef40 /contrib
parentff3d656b7ce98bf5c408a1432f88bd6b8ead2d8c (diff)
parentb0fa280751a8a3e7cee093a7fdc3656490abf984 (diff)
downloadgit-25a7850a106ed0f27b88b8ce0b89fd326120dff4.zip
git-25a7850a106ed0f27b88b8ce0b89fd326120dff4.tar.gz
git-25a7850a106ed0f27b88b8ce0b89fd326120dff4.tar.bz2
Merge branch 'maint'
* maint: Update draft release notes to 1.7.9.3 CodingGuidelines: do not use 'which' in shell scripts CodingGuidelines: Add a note about spaces after redirection post-receive-email: match up $LOGBEGIN..$LOGEND pairs correctly post-receive-email: remove unused variable
Diffstat (limited to 'contrib')
-rwxr-xr-xcontrib/hooks/post-receive-email7
1 files changed, 3 insertions, 4 deletions
diff --git a/contrib/hooks/post-receive-email b/contrib/hooks/post-receive-email
index ba077c1..01af9df 100755
--- a/contrib/hooks/post-receive-email
+++ b/contrib/hooks/post-receive-email
@@ -85,7 +85,6 @@ prep_for_email()
oldrev=$(git rev-parse $1)
newrev=$(git rev-parse $2)
refname="$3"
- maxlines=$4
# --- Interpret
# 0000->1234 (create)
@@ -461,7 +460,7 @@ generate_delete_branch_email()
{
echo " was $oldrev"
echo ""
- echo $LOGEND
+ echo $LOGBEGIN
git show -s --pretty=oneline $oldrev
echo $LOGEND
}
@@ -561,7 +560,7 @@ generate_delete_atag_email()
{
echo " was $oldrev"
echo ""
- echo $LOGEND
+ echo $LOGBEGIN
git show -s --pretty=oneline $oldrev
echo $LOGEND
}
@@ -626,7 +625,7 @@ generate_delete_general_email()
{
echo " was $oldrev"
echo ""
- echo $LOGEND
+ echo $LOGBEGIN
git show -s --pretty=oneline $oldrev
echo $LOGEND
}