From: Elia Pinto <gitter.spiros@gmail.com>
Date: Fri, 6 Jun 2014 14:55:50 +0000 (-0700)
Subject: git-bisect.sh: avoid "test <cond> -a/-o <cond>"
X-Git-Tag: v2.1.0-rc0~79^2~13
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/c82af12a1bde56fd7c3b984688ef7fe9f4c44b6e

git-bisect.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>
---

diff --git a/git-bisect.sh b/git-bisect.sh
index af4d04c3be..1e0d602f4b 100755
--- a/git-bisect.sh
+++ b/git-bisect.sh
@@ -408,7 +408,7 @@ bisect_replay () {
 	bisect_reset
 	while read git bisect command rev
 	do
-		test "$git $bisect" = "git bisect" -o "$git" = "git-bisect" || continue
+		test "$git $bisect" = "git bisect" || test "$git" = "git-bisect" || continue
 		if test "$git" = "git-bisect"
 		then
 			rev="$command"