mirror of
https://github.com/git/git.git
synced 2024-12-06 00:14:36 +08:00
git p4 test: copy source indeterminate
Msysgit testing showed that the source file found by copy detection is indeterminate when there are multiple sources to choose from. This appears to be valid. Adjust the test so that it passes if it finds any of the potential copy sources. Signed-off-by: Pete Wyckoff <pw@padd.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
4256397aca
commit
f69b3a93ca
@ -547,7 +547,7 @@ 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" = file10 -o "$src" = file11 &&
|
||||
git config git-p4.detectCopies $(($level + 2)) &&
|
||||
git p4 submit &&
|
||||
p4 filelog //depot/file12 &&
|
||||
@ -561,7 +561,7 @@ 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" = file10 -o "$src" = file11 -o "$src" = file12 &&
|
||||
git config git-p4.detectCopies $(($level - 2)) &&
|
||||
git p4 submit &&
|
||||
p4 filelog //depot/file13 &&
|
||||
|
Loading…
Reference in New Issue
Block a user