aboutsummaryrefslogtreecommitdiff
path: root/t/t4102-apply-rename.sh
diff options
context:
space:
mode:
authorElia Pinto <gitter.spiros@gmail.com>2014-06-06 07:55:57 -0700
committerJunio C Hamano <gitster@pobox.com>2014-06-09 15:53:41 -0700
commit4399345d5e491b6c432f6b3b12aabca5609d19ce (patch)
tree4b4166c3fd1e40bc3bb17c294d9e0d87f2662708 /t/t4102-apply-rename.sh
parent66e1fe7db670bdb03cc7271db11c4934a5684592 (diff)
downloadgit-4399345d5e491b6c432f6b3b12aabca5609d19ce.tar.gz
git-4399345d5e491b6c432f6b3b12aabca5609d19ce.tar.xz
t/t4102-apply-rename.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 't/t4102-apply-rename.sh')
-rwxr-xr-xt/t4102-apply-rename.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t4102-apply-rename.sh b/t/t4102-apply-rename.sh
index 49e2d6c34..fae305979 100755
--- a/t/t4102-apply-rename.sh
+++ b/t/t4102-apply-rename.sh
@@ -52,6 +52,6 @@ EOF
test_expect_success 'apply copy' \
'git apply --index --stat --summary --apply test-patch &&
- test "$(cat bar)" = "This is bar" -a "$(cat foo)" = "This is foo"'
+ test "$(cat bar)" = "This is bar" && test "$(cat foo)" = "This is foo"'
test_done