From: Robert Schiele Date: Wed, 17 Oct 2007 22:27:51 +0000 (+0200) Subject: fixing output of non-fast-forward output of post-receive-email X-Git-Tag: v1.5.3.5~37 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a2d6b872dbf4e65525c9ba55e820e2ea26011ce1;p=git.git 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 Signed-off-by: Shawn O. Pearce --- diff --git a/contrib/hooks/post-receive-email b/contrib/hooks/post-receive-email index cbbd02fad..28a06c7f3 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