aboutsummaryrefslogtreecommitdiff
path: root/git-bisect.sh
diff options
context:
space:
mode:
authorElia Pinto <gitter.spiros@gmail.com>2014-06-06 07:55:50 -0700
committerJunio C Hamano <gitster@pobox.com>2014-06-09 14:47:07 -0700
commitc82af12a1bde56fd7c3b984688ef7fe9f4c44b6e (patch)
tree9d3736828416f1cc95d2488606311f9526091ec4 /git-bisect.sh
parent6f34b79de15f92b53d050598b04444e8421d7b7d (diff)
downloadgit-c82af12a1bde56fd7c3b984688ef7fe9f4c44b6e.tar.gz
git-c82af12a1bde56fd7c3b984688ef7fe9f4c44b6e.tar.xz
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>
Diffstat (limited to 'git-bisect.sh')
-rwxr-xr-xgit-bisect.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-bisect.sh b/git-bisect.sh
index af4d04c3b..1e0d602f4 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"