From: Stephen Haberman <stephen@exigencecorp.com>
Date: Thu, 24 Jul 2008 06:13:23 +0000 (-0500)
Subject: Handle multiple base revisions--now with the code.
X-Git-Url: http://git.droids-corp.org/?a=commitdiff_plain;h=6a6222c9f5cda26f690796b60ea9ab7a549380d6;p=git-central.git

Handle multiple base revisions--now with the code.
---

diff --git a/server/update-prefer-rebase b/server/update-prefer-rebase
index 97e8a01..318536b 100644
--- a/server/update-prefer-rebase
+++ b/server/update-prefer-rebase
@@ -52,18 +52,23 @@ git rev-parse --not --branches | git rev-list --stdin $oldrev..$newrev | while r
 
 		# Find the original branch point (B)
 		parents=$(git rev-list -n 1 --parents $commit | sed 's/ /\n/g' | grep -v $commit)
-		baserev=$(git merge-base $parents)
 
-		# 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 --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 "----------------------------------------------------"
-				echo
-				echo "It looks like you should rebase instead of merging $commit"
-				echo
-				echo "----------------------------------------------------"
+		# For each baserev
+		git merge-base --all $parents | while read baserev ; do
+			# 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 --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 "----------------------------------------------------"
+					echo
+					echo "It looks like you should rebase instead of merging $commit"
+					echo
+					echo "----------------------------------------------------"
+					exit 1
+				fi
+			done
+			if [ $? -ne 0 ] ; then
 				exit 1
 			fi
 		done