From: Michael Haggerty <mhagger@alum.mit.edu>
Date: Fri, 22 Jan 2010 09:22:29 +0000 (+0100)
Subject: rebase -i: Avoid non-portable "test X -a Y"
X-Git-Tag: v1.7.0-rc0~30
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/8cddaeec0d40e68202a6afae5d09024ac1b5db9c

rebase -i: Avoid non-portable "test X -a Y"

Reported by: Eric Blake <ebb9@byu.net>

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index e551906ecd..c2f6089de8 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)