Code

t3030: Add a testcase for resolvable rename/add conflict with symlinks
authorSchalk, Ken <ken.schalk@intel.com>
Mon, 20 Sep 2010 08:28:34 +0000 (02:28 -0600)
committerJunio C Hamano <gitster@pobox.com>
Thu, 30 Sep 2010 00:32:35 +0000 (17:32 -0700)
commit8a1c0d322e9b6963f3be6949475983d517d79796
treeea2458b73a7bc6097742f6ae53c6b7b924b317c6
parenta1155adc2dde23fd664ad47399379cd0561762af
t3030: Add a testcase for resolvable rename/add conflict with symlinks

d5af510 (RE: [PATCH] Avoid rename/add conflict when contents are identical
2010-09-01) avoided erroring out in a rename/add conflict when the contents
were identical.  A simpler fix could have handled that particular testcase,
but it would not correctly handle the case where a symlink is involved.
Add another testcase using symlinks, to avoid breaking that case.

Signed-off-by: Ken Schalk <ken.schalk@intel.com>
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t3030-merge-recursive.sh