diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-07-25 19:44:18 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-07-25 19:44:22 (GMT) |
| commit | e832f7374b66d6d8a25eaab31f87c1ab3cc2d207 (patch) | |
| tree | 43a15c771817eb9311c15310ef37443cd506f755 /t/t9814-git-p4-rename.sh | |
| parent | 6a0662304d85ffa288c960f688eb9704954ea8ee (diff) | |
| download | git-e832f7374b66d6d8a25eaab31f87c1ab3cc2d207.zip git-e832f7374b66d6d8a25eaab31f87c1ab3cc2d207.tar.gz git-e832f7374b66d6d8a25eaab31f87c1ab3cc2d207.tar.bz2 | |
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>
Diffstat (limited to 't/t9814-git-p4-rename.sh')
| -rwxr-xr-x | t/t9814-git-p4-rename.sh | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/t/t9814-git-p4-rename.sh b/t/t9814-git-p4-rename.sh index 1fc1f5f..95f4421 100755 --- a/t/t9814-git-p4-rename.sh +++ b/t/t9814-git-p4-rename.sh @@ -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*//") && 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) && - test "$src" = file10 || test "$src" = file11 && + case "$src" in + file10 | file11) : ;; # happy + *) false ;; # not + && git config git-p4.detectCopies $(($level + 2)) && git p4 submit && 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*//") && 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) && - 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 p4 submit && p4 filelog //depot/file13 && |