diff options
| -rwxr-xr-x | t/t9814-git-p4-rename.sh | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/t/t9814-git-p4-rename.sh b/t/t9814-git-p4-rename.sh index efae1436ed..8b9c2950e8 100755 --- a/t/t9814-git-p4-rename.sh +++ b/t/t9814-git-p4-rename.sh @@ -163,7 +163,10 @@ test_expect_success 'detect copies' ' git commit -a -m "Copy file2 to file11" && git diff-tree -r -C --find-copies-harder HEAD && src=$(git diff-tree -r -C --find-copies-harder HEAD | sed 1d | cut -f2) && - test "$src" = file10 && + case "$src" in + file2 | file10) : ;; # happy + *) false ;; # not + esac && git config git-p4.detectCopiesHarder true && git p4 submit && p4 filelog //depot/file11 && |