From 334ae397452170dacfcd8e69e4a41f6a64f54eec Mon Sep 17 00:00:00 2001 From: Martin von Zweigbergk Date: Fri, 21 Dec 2012 11:10:11 -0800 Subject: learn to pick/revert into unborn branch cherry-picking into an unborn branch should work, so make it work, with or without --ff. Cherry-picking anything other than a commit that only adds files, will naturally result in conflicts. Similarly, revert also works, but will result in conflicts unless the specified revision only deletes files. Signed-off-by: Martin von Zweigbergk Signed-off-by: Junio C Hamano --- t/t3506-cherry-pick-ff.sh | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 't/t3506-cherry-pick-ff.sh') 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 -- cgit v1.2.3