From: Michael Haggerty Date: Thu, 14 Jan 2010 05:54:40 GMT Subject: [PATCH 01/18] rebase -i: Make the condition for an "if" more transparent Message-ID: In-Reply-To: Test $no_ff separately rather than testing it indirectly by gluing it onto a comparison of two SHA1s. Signed-off-by: Michael Haggerty --- git-rebase--interactive.sh | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index 2e56e64..fba8fb6 100755 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -166,7 +166,8 @@ pick_one () { parent_sha1=$(git rev-parse --verify $sha1^) || die "Could not get the parent of $sha1" current_sha1=$(git rev-parse --verify HEAD) - if test "$no_ff$current_sha1" = "$parent_sha1"; then + if test -z "$no_ff" -a "$current_sha1" = "$parent_sha1" + then output git reset --hard $sha1 test "a$1" = a-n && output git reset --soft $current_sha1 sha1=$(git rev-parse --short $sha1) -- 1.6.6