| commit | e0052f4613cd8f586b0b9975fedffce268ca6ce9 | |
| author | Elijah Newren <newren@gmail.com> | |
| Wed, 14 Feb 2018 18:52:02 +0000 (14 10:52 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 27 Feb 2018 22:11:58 +0000 (27 14:11 -0800) | ||
| tree | 22e8c50f49c9850239e195cb4ae5a877f8bd0bd1 | treesnapshot (tar.gz zip) |
| parent | 7b3d3b06811c3d603d47d50eb3c8775571845a80 | commitdiff |
merge-recursive: fix overwriting dirty files involved in renames
This fixes an issue that existed before my directory rename detection
patches that affects both normal renames and renames implied by
directory rename detection. Additional codepaths that only affect
overwriting of dirty files that are involved in directory rename
detection will be added in a subsequent commit.
Reviewed-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This fixes an issue that existed before my directory rename detection
patches that affects both normal renames and renames implied by
directory rename detection. Additional codepaths that only affect
overwriting of dirty files that are involved in directory rename
detection will be added in a subsequent commit.
Reviewed-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>