diff options
| author | Michael Haggerty <mhagger@alum.mit.edu> | 2010-01-22 10:22:29 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-22 13:18:14 -0800 |
| commit | 8cddaeec0d40e68202a6afae5d09024ac1b5db9c (patch) | |
| tree | abac03c9f7a4e90aa217c0b15bf88a005aae0421 /git-rebase--interactive.sh | |
| parent | 3bb7256281bb1d291bb705a57dc3f30b26b7c127 (diff) | |
| download | git-8cddaeec0d40e68202a6afae5d09024ac1b5db9c.tar.gz git-8cddaeec0d40e68202a6afae5d09024ac1b5db9c.tar.xz | |
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>
Diffstat (limited to 'git-rebase--interactive.sh')
| -rwxr-xr-x | 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 e551906ec..c2f6089de 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) |