[PATCH 09/20] git-rebase--interactive.sh: avoid "test <cond> -a/-o <cond>"
- From
Elia Pinto <gitter.spiros@gmail.com>
- Date
- Jun 6, 2014, 14:55 UTC
- Message-ID
- <1402066563-28519-10-git-send-email-gitter.spiros@gmail.com>
- In-Reply-To
- <1402066563-28519-1-git-send-email-gitter.spiros@gmail.com>
The construct is error-prone; "test" being built-in in most modern shells, the reason to avoid "test <cond> && test <cond>" spawning one extra process by using a single "test <cond> -a <cond>" no longer exists.
Signed-off-by: Elia Pinto <gitter.spiros@gmail.com> --- git-rebase--interactive.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index 6ec9d3c..797571f 100644 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -1013,7 +1013,7 @@ then git rev-list $revisions | while read rev do - if test -f "$rewritten"/$rev -a "$(sane_grep "$rev" "$state_dir"/not-cherry-picks)" = "" + if test -f "$rewritten"/$rev && test "$(sane_grep "$rev" "$state_dir"/not-cherry-picks)" = "" then # Use -f2 because if rev-list is telling us this commit is # not worthwhile, we don't want to track its multiple heads,
-- 1.7.10.4