X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=server%2Fupdate-prefer-rebase;fp=server%2Fupdate-prefer-rebase;h=81947337ce3735da6b4060ade472cb77095d567b;hb=55306bcac4cf60f5c95881d6da5b681382b3c53e;hp=9265dd5b77c90dd48855d243ecd6caf6de0a5616;hpb=d89ccdf1c39307a064840a00ef981db7dd4ad11b;p=git-central.git

diff --git a/server/update-prefer-rebase b/server/update-prefer-rebase
index 9265dd5..8194733 100644
--- a/server/update-prefer-rebase
+++ b/server/update-prefer-rebase
@@ -56,7 +56,7 @@ git rev-parse --not --branches | git rev-list --stdin $oldrev..$newrev | while r
 		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
-			parent_is_old=$(git branch --contains $parent | wc -l)
+				parent_is_old=$(git branch --contains $parent | wc -l)
 				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 [ $parent_is_old -gt 0 -a $all_commits -eq $new_commits ] ; then