t6042: add testcase covering long chains of rename conflicts
authorElijah Newren <redacted>
Mon, 2 Jul 2018 13:30:54 +0000 (06:30 -0700)
committerJunio C Hamano <redacted>
Tue, 3 Jul 2018 21:47:47 +0000 (14:47 -0700)
commit651f7f3a1b15beec5319ea95b91a7461c805f37b
tree2678d99b91c5cfe513992d0fb9e2a2b5e3291bfe
parenteee73388f25a7a0c61b2200868d93ff8d91b27ca
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 <redacted>
Signed-off-by: Junio C Hamano <redacted>
t/t6042-merge-rename-corner-cases.sh
git clone https://git.99rst.org/PROJECT