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

contrib/examples/git-clone.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/contrib/examples/git-clone.sh b/contrib/examples/git-clone.sh
index b4c9376a2c..08cf246bbb 100755
--- a/contrib/examples/git-clone.sh
+++ b/contrib/examples/git-clone.sh
@@ -516,7 +516,7 @@ then
 
 	case "$no_checkout" in
 	'')
-		test "z$quiet" = z -a "z$no_progress" = z && v=-v || v=
+		test "z$quiet" = z && test "z$no_progress" = z && v=-v || v=
 		git read-tree -m -u $v HEAD HEAD
 	esac
 fi