diff options
| author | Elijah Newren <newren@gmail.com> | 2010-07-09 13:10:54 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-07-09 23:13:00 (GMT) |
| commit | 5a2580d62f9aaa30f0acd10df9dbe7a581dd77d9 (patch) | |
| tree | f43bd060dd324f749f7d909e27eda7762cd52d84 /t/t3509-cherry-pick-merge-df.sh | |
| parent | 37348937ff391f01981e8af10b2f615268fd2509 (diff) | |
| download | git-5a2580d62f9aaa30f0acd10df9dbe7a581dd77d9.zip git-5a2580d62f9aaa30f0acd10df9dbe7a581dd77d9.tar.gz git-5a2580d62f9aaa30f0acd10df9dbe7a581dd77d9.tar.bz2 | |
merge_recursive: Fix renames across paths below D/F conflicts
The rename logic in process_renames() handles renames and merging of file
contents and then marks files as processed. However, there may be higher
stage entries left in the index for other reasons (e.g., due to D/F
conflicts). By checking for such cases and marking the entry as not
processed, it allows process_entry() later to look at it and handle those
higher stages.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3509-cherry-pick-merge-df.sh')
| -rwxr-xr-x | t/t3509-cherry-pick-merge-df.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t3509-cherry-pick-merge-df.sh b/t/t3509-cherry-pick-merge-df.sh index 7c05e16..6e7ef84 100755 --- a/t/t3509-cherry-pick-merge-df.sh +++ b/t/t3509-cherry-pick-merge-df.sh @@ -26,7 +26,7 @@ test_expect_success 'Setup rename across paths each below D/F conflicts' ' git commit -m f1 ' -test_expect_failure 'Cherry-pick succeeds with rename across D/F conflicts' ' +test_expect_success 'Cherry-pick succeeds with rename across D/F conflicts' ' git reset --hard && git checkout master^0 && git cherry-pick branch |