Skip to content

Commit

Permalink
fixing output of non-fast-forward output of post-receive-email
Browse files Browse the repository at this point in the history
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 <[email protected]>
Signed-off-by: Shawn O. Pearce <[email protected]>
  • Loading branch information
schiele authored and spearce committed Oct 18, 2007
1 parent 0995520 commit a2d6b87
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion contrib/hooks/post-receive-email
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit a2d6b87

Please sign in to comment.