Don't let merge commits fool the prefer-rebase script.

[git-central.git] / server / update-prefer-rebase

diff --git a/server/update-prefer-rebase b/server/update-prefer-rebase
index 7dc1ef81ae755150fa28174fdca34f164b27db97..79c3bef604778bdbb731a4bbcb110fe20626ce4d 100644 (file)
--- a/server/update-prefer-rebase
+++ b/server/update-prefer-rebase
@@ -56,7 +56,8 @@ git rev-parse --not --branches | git rev-list --stdin $oldrev..$newrev | while r
 
                # For each parent
                git rev-list -n 1 --parents $commit | sed 's/ /\n/g' | grep -v $commit | while read parent ; do
-                       all_commits=$(git rev-list $baserev..$parent | wc -l)
+                       echo "looking at $baserev..$parent for $commit"
+                       all_commits=$(git rev-list --first-parent $baserev..$parent | wc -l)
                        new_commits=$(git rev-parse --not --branches | git rev-list --stdin $baserev..$parent | wc -l)
                        if [[ $all_commits -eq $new_commits ]] ; then
                                echo "----------------------------------------------------"