Don't go into merges.

For the commit list anyway--diff is still in the works.

diff --git a/server/post-receive-email b/server/post-receive-email
index 26253cfb9bee189347aa3a3c315dc36692381d27..cb536f58f218d998a3a0b60640e795d9fb463a11 100755 (executable)
--- a/server/post-receive-email
+++ b/server/post-receive-email
@@ -334,7 +334,8 @@ generate_update_branch_email()
        # have already had notification emails and is present to show the
        # full detail of the change from rolling back the old revision to
        # the base revision and then forward to the new revision
-       for rev in $(git rev-list $oldrev..$newrev)
+       # Changed: added --first-parent to not go down merge commits
+       for rev in $(git rev-list --first-parent $oldrev..$newrev)
        do
                revtype=$(git cat-file -t "$rev")
                echo "       via  $rev ($revtype)"

diff --git a/tests/t2203-1.txt b/tests/t2203-1.txt
index b7e08129ab27b9832da3bedcec20b80d8a7cb66d..843e2baba7c302130c4c05d1284afb5363f458db 100644 (file)
--- a/tests/t2203-1.txt
+++ b/tests/t2203-1.txt
@@ -8,8 +8,6 @@ X-Git-Newrev: $new_commit_hash
 
 The branch, topic1 has been updated
        via  $new_commit_hash (commit)
-       via  $second_stable_hash (commit)
-       via  $first_stable_hash (commit)
       from  $old_commit_hash (commit)
 
 Those revisions listed above that are new to this repository have

diff --git a/tests/t2203-2.txt b/tests/t2203-2.txt
index b7de3f1c3cea28db64ca42ead3c51cc6746d06eb..ac8ba9a2e2820114d99ae4513b3751e835686b1b 100644 (file)
--- a/tests/t2203-2.txt
+++ b/tests/t2203-2.txt
@@ -8,8 +8,6 @@ X-Git-Newrev: $new_commit_hash
 
 The branch, topic1 has been updated
        via  $new_commit_hash (commit)
-       via  $second_stable_hash (commit)
-       via  $first_stable_hash (commit)
       from  $old_commit_hash (commit)
 
 Those revisions listed above that are new to this repository have