summaryrefslogtreecommitdiff
path: root/t/t5402-post-merge-hook.sh
diff options
context:
space:
mode:
authorLibravatar Vitor Antunes <vitor.hda@gmail.com>2015-03-28 00:03:03 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-03-28 08:55:54 -0700
commit138ce9c29f622ea962ee3ed676dd137e20397fcf (patch)
tree1115e53f15d0ef09b109ad4bb4eb66a34621eca7 /t/t5402-post-merge-hook.sh
parentt9814: fix broken shell syntax in git-p4 rename test (diff)
downloadtgif-138ce9c29f622ea962ee3ed676dd137e20397fcf.tar.xz
git-p4: fix copy detection test
File file11 is copied from file2 and diff-tree correctly reports this file as its the source. But it is possible that the diff-tree algorithm detects file10, which was also copied from file2, as the origin of the new file. This fix uses a case statement to support both files as the source of file11, as was done in other tests in this file. Signed-off-by: Vitor Antunes <vitor.hda@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t5402-post-merge-hook.sh')
0 files changed, 0 insertions, 0 deletions