diff options
| author | Elijah Newren <newren@gmail.com> | 2010-09-20 02:29:06 -0600 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-09-29 17:37:05 -0700 |
| commit | 2adc7dcc111636ed16601dc7516ced1c5cfda088 (patch) | |
| tree | d40b124b9f9be45e4b74c7991cbcc3bb32d2031b /t/t6022-merge-rename.sh | |
| parent | a0de2f6bd3b79f7ab61ea90f795b964a7f7f3d6d (diff) | |
| download | git-2adc7dcc111636ed16601dc7516ced1c5cfda088.tar.gz git-2adc7dcc111636ed16601dc7516ced1c5cfda088.tar.xz | |
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>
Diffstat (limited to 't/t6022-merge-rename.sh')
| -rwxr-xr-x | t/t6022-merge-rename.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t6022-merge-rename.sh b/t/t6022-merge-rename.sh index 9bf190e03..0b6700242 100755 --- a/t/t6022-merge-rename.sh +++ b/t/t6022-merge-rename.sh @@ -692,7 +692,7 @@ test_expect_success 'setup rename one file to two; directories moving out of the git commit -m "Rename to two" ' -test_expect_failure 'check handling of differently renamed file with D/F conflicts' ' +test_expect_success 'check handling of differently renamed file with D/F conflicts' ' git checkout -q first-rename-redo^0 && test_must_fail git merge --strategy=recursive second-rename-redo && |