summaryrefslogtreecommitdiff
path: root/fetch-pack.h
diff options
context:
space:
mode:
authorElijah Newren <newren@gmail.com>2018-07-02 13:30:54 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-07-03 21:47:47 (GMT)
commit651f7f3a1b15beec5319ea95b91a7461c805f37b (patch)
tree2678d99b91c5cfe513992d0fb9e2a2b5e3291bfe /fetch-pack.h
parenteee73388f25a7a0c61b2200868d93ff8d91b27ca (diff)
downloadgit-651f7f3a1b15beec5319ea95b91a7461c805f37b.zip
git-651f7f3a1b15beec5319ea95b91a7461c805f37b.tar.gz
git-651f7f3a1b15beec5319ea95b91a7461c805f37b.tar.bz2
t6042: add testcase covering long chains of rename conflicts
Each rename is a lego: the source side could be connected to a delete or another rename, and the destination side could be connected to a rename or a conflicting add. Previous tests combined these to get e.g. rename/rename(1to2)/add/add, rename/rename(2to1)/delete/delete, and rename/add/delete. But we can also build bigger chains of conflicts. Add a testcase demonstrating this. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'fetch-pack.h')
0 files changed, 0 insertions, 0 deletions