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/t3506-cherry-pick-ff.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/t3506-cherry-pick-ff.sh')
| -rwxr-xr-x | t/t3506-cherry-pick-ff.sh | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/t/t3506-cherry-pick-ff.sh b/t/t3506-cherry-pick-ff.sh index 51ca391e47..373aad623c 100755 --- a/t/t3506-cherry-pick-ff.sh +++ b/t/t3506-cherry-pick-ff.sh @@ -105,4 +105,12 @@ test_expect_success 'cherry pick a root commit with --ff' ' test "$(git rev-parse --verify HEAD)" = "1df192cd8bc58a2b275d842cede4d221ad9000d1" ' +test_expect_success 'chery-pick --ff on unborn branch' ' + git checkout --orphan unborn && + git rm --cached -r . && + rm -rf * && + git cherry-pick --ff first && + test_cmp_rev first HEAD +' + test_done |