diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-02-07 15:16:04 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-02-07 15:16:04 -0800 |
| commit | 57ff1703d72db1cf33f985dcebfb03fdaab758dc (patch) | |
| tree | f56f8404a9e768e3de582a662ee66325faf73c07 /t/t3501-revert-cherry-pick.sh | |
| parent | Merge branch 'nd/fix-perf-parameters-in-tests' into maint (diff) | |
| parent | learn to pick/revert into unborn branch (diff) | |
| download | tgif-57ff1703d72db1cf33f985dcebfb03fdaab758dc.tar.xz | |
Merge branch 'mz/pick-unborn' into maint
"git cherry-pick" did not replay a root commit to an unborn branch.
* mz/pick-unborn:
learn to pick/revert into unborn branch
tests: move test_cmp_rev to test-lib-functions
Diffstat (limited to 't/t3501-revert-cherry-pick.sh')
| -rwxr-xr-x | t/t3501-revert-cherry-pick.sh | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/t/t3501-revert-cherry-pick.sh b/t/t3501-revert-cherry-pick.sh index 34c86e5de6..6f489e20ee 100755 --- a/t/t3501-revert-cherry-pick.sh +++ b/t/t3501-revert-cherry-pick.sh @@ -100,4 +100,13 @@ test_expect_success 'revert forbidden on dirty working tree' ' ' +test_expect_success 'chery-pick on unborn branch' ' + git checkout --orphan unborn && + git rm --cached -r . && + rm -rf * && + git cherry-pick initial && + git diff --quiet initial && + ! test_cmp_rev initial HEAD +' + test_done |