git-rebase--interactive.sh: avoid "test <cond> -a/-o <cond>"
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> Reviewed-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Elia Pinto committed
Jun 6, 2014 at 07:55 UTC
e425f6ad4d14d49fee09712af0aa6f56037e7dd7
1 file changed
+1
-1
git-rebase--interactive.sh
+1
-1
@@ -1013,7 +1013,7 @@ then
1013
git rev-list $revisions |
1014
while read rev
1015
do
1016
- if test -f "$rewritten"/$rev -a "$(sane_grep "$rev" "$state_dir"/not-cherry-picks)" = ""
1016
+ if test -f "$rewritten"/$rev && test "$(sane_grep "$rev" "$state_dir"/not-cherry-picks)" = ""
1017
then
1018
# Use -f2 because if rev-list is telling us this commit is
1019
# not worthwhile, we don't want to track its multiple heads,