diff options
| author |  Elijah Newren <newren@gmail.com> | 2018-04-19 10:58:14 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-05-08 16:11:00 +0900 |
| commit | bc71c4eebe7ecbb00e06c6b62bc9f0e42aee9d9b (patch) | |
| tree | d3a701b55c5e5b4843cf4bf5e4cc9cd24afb43ec /merge-blobs.h | |
| parent | merge-recursive: fix remaining directory rename + dirty overwrite cases (diff) | |
| download | tgif-bc71c4eebe7ecbb00e06c6b62bc9f0e42aee9d9b.tar.xz | |
directory rename detection: new testcases showcasing a pair of bugs
Add a testcase showing spurious rename/rename(1to2) conflicts occurring
due to directory rename detection.
Also add a pair of testcases dealing with moving directory hierarchies
around that were suggested by Stefan Beller as "food for thought" during
his review of an earlier patch series, but which actually uncovered a
bug. Round things out with a test that is a cross between the two
testcases that showed existing bugs in order to make sure we aren't
merely addressing problems in isolation but in general.
Reviewed-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-blobs.h')
0 files changed, 0 insertions, 0 deletions