From 6493056cf4bc8279d62581bebbbacccf5741c09c Mon Sep 17 00:00:00 2001 From: Geoffrey Thomas Date: Sat, 12 Sep 2009 15:29:40 -0400 Subject: [PATCH] git-hooks/zephyr-post-receive: Use --first-parent when listing commits. This avoids zephyring the history of a merged-in branch, and just zephyrs the merge commit itself. Signed-off-by: Geoffrey Thomas --- git-hooks/zephyr-post-receive | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-hooks/zephyr-post-receive b/git-hooks/zephyr-post-receive index 48534d0..bd06fe4 100755 --- a/git-hooks/zephyr-post-receive +++ b/git-hooks/zephyr-post-receive @@ -31,7 +31,7 @@ while read oldrev newrev refname; do -m "New branch created." continue fi - git rev-list --reverse "$oldrev..$newrev" | while read rev; do + git rev-list --first-parent --reverse "$oldrev..$newrev" | while read rev; do shortrev=`git log -1 --pretty=format:%h "$rev"` (git show --stat $usecolor "$rev" | sed -e 's/@/@@/g' \ -- 2.45.0