From: Michael Haggerty Date: Fri, 22 Jan 2010 09:22:29 GMT Subject: [PATCH 1/3] rebase -i: Avoid non-portable "test X -a Y" Message-ID: <0c2c17066d3bc369e4fb8f96839f63b50606fd5f.1264151435.git.mhagger@alum.mit.edu> In-Reply-To: Reported by: Eric Blake Signed-off-by: Michael Haggerty --- git-rebase--interactive.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index e551906..c2f6089 100755 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -235,7 +235,7 @@ 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 -z "$no_ff" -a "$current_sha1" = "$parent_sha1" + if test -z "$no_ff" && test "$current_sha1" = "$parent_sha1" then output git reset --hard $sha1 output warn Fast-forward to $(git rev-parse --short $sha1) -- 1.6.6