diff options
author | Junio C Hamano <gitster@pobox.com> | 2017-01-17 22:49:28 (GMT) |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2017-01-17 22:49:28 (GMT) |
commit | 7479ca4b44193acee43c480ae37e0bec98316f7a (patch) | |
tree | 60792ba401dcb07ccd2ef285b3b55badc56ac525 /t | |
parent | cf479b4fb5d8417ccea306fa9f3491ec2e873399 (diff) | |
parent | 1c25d2d8ed4c5154c9059918e20e75cda3bede81 (diff) | |
download | git-7479ca4b44193acee43c480ae37e0bec98316f7a.zip git-7479ca4b44193acee43c480ae37e0bec98316f7a.tar.gz git-7479ca4b44193acee43c480ae37e0bec98316f7a.tar.bz2 |
Merge branch 'jc/renormalize-merge-kill-safer-crlf' into maint
Fix a corner case in merge-recursive regression that crept in
during 2.10 development cycle.
* jc/renormalize-merge-kill-safer-crlf:
convert: git cherry-pick -Xrenormalize did not work
merge-recursive: handle NULL in add_cacheinfo() correctly
cherry-pick: demonstrate a segmentation fault
Diffstat (limited to 't')
-rwxr-xr-x | t/t3501-revert-cherry-pick.sh | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/t/t3501-revert-cherry-pick.sh b/t/t3501-revert-cherry-pick.sh index 394f000..4f2a263 100755 --- a/t/t3501-revert-cherry-pick.sh +++ b/t/t3501-revert-cherry-pick.sh @@ -141,4 +141,16 @@ test_expect_success 'cherry-pick "-" works with arguments' ' test_cmp expect actual ' +test_expect_success 'cherry-pick works with dirty renamed file' ' + test_commit to-rename && + git checkout -b unrelated && + test_commit unrelated && + git checkout @{-1} && + git mv to-rename.t renamed && + test_tick && + git commit -m renamed && + echo modified >renamed && + git cherry-pick refs/heads/unrelated +' + test_done |