X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=git%2Fpost-receive-email;h=c565634e6e2f257a1ae00fc2f605a311db5bd971;hb=6d9e2243954872457115bbb9ac1ecb1d161acced;hp=7e6d1f876c5aed98bf9cfb24844e72236f262d59;hpb=0b51e9b6b328ed3e622728eae68b4988eefdbf5b;p=sbcl.git

diff --git a/git/post-receive-email b/git/post-receive-email
index 7e6d1f8..c565634 100755
--- a/git/post-receive-email
+++ b/git/post-receive-email
@@ -405,8 +405,8 @@ generate_update_branch_email()
 		# echo "Those revisions listed above that are new to this repository have"
 		# echo "not appeared on any other notification email; so we list those"
 		# echo "revisions in full, below."
+		# echo ""
 
-		echo ""
 		echo $LOGBEGIN
 		show_new_revisions
 
@@ -704,7 +704,7 @@ if [ -n "$1" -a -n "$2" -a -n "$3" ]; then
 else
 	while read oldrev newrev refname
 	do
-	  echo "Sending email for $refname: $oldrev -> $newrev"
+          echo "Sending mail for $refname: $oldrev -> $newrev"
 	  # SBCL KLUDGE: the default script sends one email per
 	  # push. We want one per commit. As long as we're
 	  # in fast-forward-only world, this should do the
@@ -714,6 +714,7 @@ else
               ! expr "$refname" : "refs/heads/" > /dev/null)        # not a branch
 	  then
 	      # Just one email.
+              echo "Not a branch update: all changes in one email."
 	      generate_email $oldrev $newrev $refname | send_mail
 	  else
               # Get all revisions from old to new.
@@ -722,17 +723,20 @@ else
               # Check for merges.
               for rev in $revlist
               do
-                  if ($no_merges && ! git rev-parse --verify --quiet "$rev"^2 > /dev/null)
+                  if ($no_merges && git rev-parse --verify --quiet "$rev"^2 > /dev/null)
                   then
+                      echo "Merge detected: $rev. Sending all commits in a single email."
                       no_merges=false
                   fi
               done
               if $no_merges
               then
                   # Simple branch update, one mail per commit.
+                  echo "Sending one email per commit."
 	          lastrev=$oldrev
 	          for step in $revlist
 	          do
+                      echo "Sending: $(git log -n1 --oneline $step)"
 		      generate_email $lastrev $step $refname | send_mail
 		      lastrev=$step
 	          done