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 e551906ecd2a72fa56fa6ef5dba8f12708acb337..c2f6089de8dd74f9740d0ca4c5225248ec1bc1e7 100755 (executable)
--- 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)
        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)
        then
                output git reset --hard $sha1
                output warn Fast-forward to $(git rev-parse --short $sha1)