diff options
| author | Elijah Newren <newren@gmail.com> | 2018-02-14 10:52:02 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-02-27 14:11:58 -0800 |
| commit | e0052f4613cd8f586b0b9975fedffce268ca6ce9 (patch) | |
| tree | 22e8c50f49c9850239e195cb4ae5a877f8bd0bd1 /t/t3501-revert-cherry-pick.sh | |
| parent | 7b3d3b06811c3d603d47d50eb3c8775571845a80 (diff) | |
| download | git-e0052f4613cd8f586b0b9975fedffce268ca6ce9.tar.gz | |
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>
Diffstat (limited to 't/t3501-revert-cherry-pick.sh')
| -rwxr-xr-x | t/t3501-revert-cherry-pick.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t3501-revert-cherry-pick.sh b/t/t3501-revert-cherry-pick.sh index 783bdbf59d..0d89f6d0f6 100755 --- a/t/t3501-revert-cherry-pick.sh +++ b/t/t3501-revert-cherry-pick.sh @@ -141,7 +141,7 @@ test_expect_success 'cherry-pick "-" works with arguments' ' test_cmp expect actual ' -test_expect_failure 'cherry-pick works with dirty renamed file' ' +test_expect_success 'cherry-pick works with dirty renamed file' ' test_commit to-rename && git checkout -b unrelated && test_commit unrelated && |