diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-10-23 22:21:35 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-10-23 22:21:35 +0200 |
| commit | f2c1b01c24b6c1df962a6526661cf3a58f3c6a56 (patch) | |
| tree | d77d3cf65e96930095dbc40f76cb356287696258 /t/t3501-revert-cherry-pick.sh | |
| parent | Merge branch 'mg/more-textconv' (diff) | |
| parent | cherry-pick: handle "-" after parsing options (diff) | |
| download | git-f2c1b01c24b6c1df962a6526661cf3a58f3c6a56.tar.xz git-f2c1b01c24b6c1df962a6526661cf3a58f3c6a56.zip | |
Merge branch 'hu/cherry-pick-previous-branch'
"git cherry-pick" without further options would segfault.
Could use a follow-up to handle '-' after argv[1] better.
* hu/cherry-pick-previous-branch:
cherry-pick: handle "-" after parsing options
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 bff6ffe088..51f3bbb8af 100755 --- a/t/t3501-revert-cherry-pick.sh +++ b/t/t3501-revert-cherry-pick.sh @@ -129,4 +129,16 @@ test_expect_success 'cherry-pick "-" is meaningless without checkout' ' ) ' +test_expect_success 'cherry-pick "-" works with arguments' ' + git checkout -b side-branch && + test_commit change actual change && + git checkout master && + git cherry-pick -s - && + echo "Signed-off-by: C O Mitter <committer@example.com>" >expect && + git cat-file commit HEAD | grep ^Signed-off-by: >signoff && + test_cmp expect signoff && + echo change >expect && + test_cmp expect actual +' + test_done |