diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-12-19 22:45:30 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-12-19 22:45:30 (GMT) |
| commit | 1749053d0278f2a533f79915f03c379e5f738b39 (patch) | |
| tree | b4de22a11564dc1248cbce10a3d7ac1c5129e81f /t/t3501-revert-cherry-pick.sh | |
| parent | 8b0db484e11aa86e6b8bf4d7243d0c81bf4b3c33 (diff) | |
| parent | 1c25d2d8ed4c5154c9059918e20e75cda3bede81 (diff) | |
| download | git-1749053d0278f2a533f79915f03c379e5f738b39.zip git-1749053d0278f2a533f79915f03c379e5f738b39.tar.gz git-1749053d0278f2a533f79915f03c379e5f738b39.tar.bz2 | |
Merge branch 'jc/renormalize-merge-kill-safer-crlf'
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/t3501-revert-cherry-pick.sh')
| -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 |