mirror of
https://github.com/git/git
synced 2024-08-27 19:49:21 +00:00
t9814: fix misconversion from test $a -o $b to test $a || test $b
Spotted-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
6a0662304d
commit
e832f7374b
|
@ -177,7 +177,10 @@ test_expect_success 'detect copies' '
|
||||||
level=$(git diff-tree -r -C --find-copies-harder HEAD | sed 1d | cut -f1 | cut -d" " -f5 | sed "s/C0*//") &&
|
level=$(git diff-tree -r -C --find-copies-harder HEAD | sed 1d | cut -f1 | cut -d" " -f5 | sed "s/C0*//") &&
|
||||||
test -n "$level" && test "$level" -gt 0 && test "$level" -lt 98 &&
|
test -n "$level" && test "$level" -gt 0 && test "$level" -lt 98 &&
|
||||||
src=$(git diff-tree -r -C --find-copies-harder HEAD | sed 1d | cut -f2) &&
|
src=$(git diff-tree -r -C --find-copies-harder HEAD | sed 1d | cut -f2) &&
|
||||||
test "$src" = file10 || test "$src" = file11 &&
|
case "$src" in
|
||||||
|
file10 | file11) : ;; # happy
|
||||||
|
*) false ;; # not
|
||||||
|
&&
|
||||||
git config git-p4.detectCopies $(($level + 2)) &&
|
git config git-p4.detectCopies $(($level + 2)) &&
|
||||||
git p4 submit &&
|
git p4 submit &&
|
||||||
p4 filelog //depot/file12 &&
|
p4 filelog //depot/file12 &&
|
||||||
|
@ -191,7 +194,10 @@ test_expect_success 'detect copies' '
|
||||||
level=$(git diff-tree -r -C --find-copies-harder HEAD | sed 1d | cut -f1 | cut -d" " -f5 | sed "s/C0*//") &&
|
level=$(git diff-tree -r -C --find-copies-harder HEAD | sed 1d | cut -f1 | cut -d" " -f5 | sed "s/C0*//") &&
|
||||||
test -n "$level" && test "$level" -gt 2 && test "$level" -lt 100 &&
|
test -n "$level" && test "$level" -gt 2 && test "$level" -lt 100 &&
|
||||||
src=$(git diff-tree -r -C --find-copies-harder HEAD | sed 1d | cut -f2) &&
|
src=$(git diff-tree -r -C --find-copies-harder HEAD | sed 1d | cut -f2) &&
|
||||||
test "$src" = file10 || test "$src" = file11 || test "$src" = file12 &&
|
case "$src" in
|
||||||
|
file10 | file11 | file12) : ;; # happy
|
||||||
|
*) false ;; # not
|
||||||
|
&&
|
||||||
git config git-p4.detectCopies $(($level - 2)) &&
|
git config git-p4.detectCopies $(($level - 2)) &&
|
||||||
git p4 submit &&
|
git p4 submit &&
|
||||||
p4 filelog //depot/file13 &&
|
p4 filelog //depot/file13 &&
|
||||||
|
|
Loading…
Reference in a new issue