On Fri, Apr 13, 2012 at 02:45:06PM -0400, Neil Horman wrote:
>
> +test_expect_success 'cherry pick an empty non-ff commit without --allow-empty' '
> + git checkout master &&
> + echo fourth >> file2 &&
> + git add file2 &&
> + git commit -m "fourth" && {
> + test_must_fail git cherry-pick empty-branch2
> + }
> +'
You don't need the braces. The same below.
> +
> +test_expect_success 'cherry pick an empty non-ff commit with --allow-empty' '
> + git checkout master && {
> + git cherry-pick --allow-empty empty-branch2
> + }
> +'
> +
> +test_expect_success 'cherry pick with --keep-redundant-commits' '
> + git checkout master && {
> + git cherry-pick --keep-redundant-commits HEAD^
> + }
> +'
And the expected result is that the HEAD commit is not removed, right?
You should check for that as well.
Also, please checkout empty-branch2^0 first, in order to make the test
independent of its predecessor.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html