]> git.droids-corp.org - git-central.git/commitdiff
Fix missing tabs.
authorStephen Haberman <stephen@exigencecorp.com>
Thu, 25 Sep 2008 06:04:02 +0000 (01:04 -0500)
committerStephen Haberman <stephen@exigencecorp.com>
Thu, 25 Sep 2008 06:04:02 +0000 (01:04 -0500)
server/update-prefer-rebase

index 9ccf01c913a1c804a99aa59e946c4606d045a698..9265dd5b77c90dd48855d243ecd6caf6de0a5616 100644 (file)
@@ -56,13 +56,13 @@ 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
-                    # echo "parent=$parent"
-                    # echo "all_commits=$all_commits"
-                    # echo "new_commits=$new_commits"
+                                       # echo "parent=$parent"
+                                       # echo "all_commits=$all_commits"
+                                       # echo "new_commits=$new_commits"
                                        echo "----------------------------------------------------"
                                        echo
                                        echo "It looks like you should rebase instead of merging $commit"