aboutsummaryrefslogtreecommitdiff
path: root/contrib/hooks
diff options
context:
space:
mode:
authorJiang Xin <worldhello.net@gmail.com>2012-02-28 12:23:26 +0800
committerJiang Xin <worldhello.net@gmail.com>2012-02-28 12:23:26 +0800
commit508d1244dc8d38188c70e98207efa8a97d16b47c (patch)
treefc8688b80be453755f8135df11bf1db2d247725a /contrib/hooks
parent0ad9e96d2e2f42f4d2ce7cd612bf741913242bc0 (diff)
parent25a7850a106ed0f27b88b8ce0b89fd326120dff4 (diff)
downloadgit-508d1244dc8d38188c70e98207efa8a97d16b47c.tar.gz
git-508d1244dc8d38188c70e98207efa8a97d16b47c.tar.xz
Merge branch 'master' into git-po
Diffstat (limited to 'contrib/hooks')
-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 ba077c13f..01af9df15 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
}