[PATCH 1/3] rebase -i: Avoid non-portable "test X -a Y"
flat view
DORMANTno replies
From: Michael Haggerty <hidden>
Date: 2016-06-15 22:48:05
Subsystem:
the rest · Maintainer:
Linus Torvalds
Reported by: Eric Blake [off-list ref] Signed-off-by: Michael Haggerty <redacted> --- 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