threads / patch / 10348

patchfixing output of non-fast-forward output of post-receive-email

Subject: [PATCH] fixing output of non-fast-forward output of post-receive-email

## tl;dr

One message between Oct 17, 2007 and Oct 17, 2007. Diffs are folded; open one to read it.

replies: 0people: 1as markdown or json

Robert Schiele· Oct 17, 2007, 22:27 UTC · lore

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>
---
 contrib/hooks/post-receive-email |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
Show changes to contrib/hooks/post-receive-email +1 −1
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
-- 
1.5.2.4

← back to recent threads