From 941516a347565fe4244a86a829baf4980532214a Mon Sep 17 00:00:00 2001 From: Stephen Haberman Date: Thu, 21 Aug 2008 13:58:57 -0500 Subject: [PATCH] Don't go into merges. For the commit list anyway--diff is still in the works. --- server/post-receive-email | 3 ++- tests/t2203-1.txt | 2 -- tests/t2203-2.txt | 2 -- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/server/post-receive-email b/server/post-receive-email index 26253cf..cb536f5 100755 --- 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 b7e0812..843e2ba 100644 --- 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 b7de3f1..ac8ba9a 100644 --- 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 -- 2.39.5