summaryrefslogtreecommitdiff
path: root/contrib/hooks/post-receive-email
diff options
context:
space:
mode:
authorRobert Schiele <rschiele@gmail.com>2007-10-17 22:27:51 (GMT)
committerShawn O. Pearce <spearce@spearce.org>2007-10-18 04:59:25 (GMT)
commita2d6b872dbf4e65525c9ba55e820e2ea26011ce1 (patch)
tree04f0995283cdffbd34ba79b14ec36a1639720d79 /contrib/hooks/post-receive-email
parent09955207d148c5f3964002b7f3a4e13db3050777 (diff)
downloadgit-a2d6b872dbf4e65525c9ba55e820e2ea26011ce1.zip
git-a2d6b872dbf4e65525c9ba55e820e2ea26011ce1.tar.gz
git-a2d6b872dbf4e65525c9ba55e820e2ea26011ce1.tar.bz2
fixing output of non-fast-forward output of post-receive-email
post-receive-email has one place where the variable fast_forward is not spelled correctly. At the same place the logic was reversed. The combination of both bugs made the script work correctly for fast-forward commits but not for non-fast-forward ones. This change fixes this to be correct in both cases. Signed-off-by: Robert Schiele <rschiele@gmail.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Diffstat (limited to 'contrib/hooks/post-receive-email')
-rw-r--r--contrib/hooks/post-receive-email2
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/hooks/post-receive-email b/contrib/hooks/post-receive-email
index cbbd02f..28a06c7 100644
--- a/contrib/hooks/post-receive-email
+++ b/contrib/hooks/post-receive-email
@@ -323,7 +323,7 @@ generate_update_branch_email()
echo " via $rev ($revtype)"
done
- if [ -z "$fastforward" ]; then
+ if [ "$fast_forward" ]; then
echo " from $oldrev ($oldrev_type)"
else
# 1. Existing revisions were removed. In this case newrev is a