projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: a0de2f6) | patch
conflict_rename_rename_1to2(): Fix checks for presence of D/F conflicts
authorElijah Newren <newren@gmail.com>
Mon, 20 Sep 2010 08:29:06 +0000 (02:29 -0600)
committerJunio C Hamano <gitster@pobox.com>
Thu, 30 Sep 2010 00:37:05 +0000 (17:37 -0700)
commit2adc7dcc111636ed16601dc7516ced1c5cfda088
treed40b124b9f9be45e4b74c7991cbcc3bb32d2031btree | snapshot
parenta0de2f6bd3b79f7ab61ea90f795b964a7f7f3d6dcommit | diff
conflict_rename_rename_1to2(): Fix checks for presence of D/F conflicts

This function is called from process_df_entry(), near the end of the merge.
Rather than just checking whether one of the sides of the merge had a
directory at the same path as one of our files, check whether that
directory is still present by this point of our merge.

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
merge-recursive.c diff | blob | history
t/t6022-merge-rename.sh diff | blob | history
Git—the stupid content tracker