t/t9814-git-p4-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>
Elia Pinto committed
Jun 6, 2014 at 07:56 UTC
795fcb0e5eafacdb038652f538af922e956cf5fe
1 file changed
+2
-2
t/t9814-git-p4-rename.sh
+2
-2
@@ -177,7 +177,7 @@ test_expect_success 'detect copies' '
177
level=$(git diff-tree -r -C --find-copies-harder HEAD | sed 1d | cut -f1 | cut -d" " -f5 | sed "s/C0*//") &&
178
test -n "$level" && test "$level" -gt 0 && test "$level" -lt 98 &&
179
src=$(git diff-tree -r -C --find-copies-harder HEAD | sed 1d | cut -f2) &&
180
- test "$src" = file10 -o "$src" = file11 &&
180
+ test "$src" = file10 || test "$src" = file11 &&
181
git config git-p4.detectCopies $(($level + 2)) &&
182
git p4 submit &&
183
p4 filelog //depot/file12 &&
@@ -191,7 +191,7 @@ test_expect_success 'detect copies' '
191
level=$(git diff-tree -r -C --find-copies-harder HEAD | sed 1d | cut -f1 | cut -d" " -f5 | sed "s/C0*//") &&
192
test -n "$level" && test "$level" -gt 2 && test "$level" -lt 100 &&
193
src=$(git diff-tree -r -C --find-copies-harder HEAD | sed 1d | cut -f2) &&
194
- test "$src" = file10 -o "$src" = file11 -o "$src" = file12 &&
194
+ test "$src" = file10 || test "$src" = file11 || test "$src" = file12 &&
195
git config git-p4.detectCopies $(($level - 2)) &&
196
git p4 submit &&
197
p4 filelog //depot/file13 &&