diff options
| author | Robert Schiele <rschiele@gmail.com> | 2007-10-18 00:27:51 +0200 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2007-10-18 00:59:25 -0400 |
| commit | a2d6b872dbf4e65525c9ba55e820e2ea26011ce1 (patch) | |
| tree | 04f0995283cdffbd34ba79b14ec36a1639720d79 | |
| parent | 09955207d148c5f3964002b7f3a4e13db3050777 (diff) | |
| download | git-a2d6b872dbf4e65525c9ba55e820e2ea26011ce1.tar.gz git-a2d6b872dbf4e65525c9ba55e820e2ea26011ce1.tar.xz | |
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>
| -rw-r--r-- | contrib/hooks/post-receive-email | 2 |
1 files changed, 1 insertions, 1 deletions
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 |