From: Stephen Haberman Date: Thu, 25 Sep 2008 19:47:40 +0000 (-0500) Subject: Fix indentation. X-Git-Url: http://git.droids-corp.org/?p=git-central.git;a=commitdiff_plain;h=55306bcac4cf60f5c95881d6da5b681382b3c53e Fix indentation. --- 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