Junio C Hamano <gitster@xxxxxxxxx> writes:
> Junio C Hamano <gitster@xxxxxxxxx> writes:
>
>> Phil Hord <hordp@xxxxxxxxx> writes:
>>
>>> In git.git 'master' when I cherry-pick a commit which is eventually
>>> empty, git gives me a friendly description of my supposed error, leaves
>>> my cherry-pick "pending" and exits with an error code.
>>> ...
>>> In 'next' this is broken.
The above was written back when nh/empty-rebase topic was not in 'master'
yet.
The attached will help reproducing it.
t/t3505-cherry-pick-empty.sh | 19 ++++++++++++++++++-
1 file changed, 18 insertions(+), 1 deletion(-)
diff --git a/t/t3505-cherry-pick-empty.sh b/t/t3505-cherry-pick-empty.sh
index 92f00cd..bd06981 100755
--- a/t/t3505-cherry-pick-empty.sh
+++ b/t/t3505-cherry-pick-empty.sh
@@ -23,8 +23,19 @@ test_expect_success setup '
git checkout master &&
git checkout -b empty-branch2 &&
test_tick &&
- git commit --allow-empty -m "empty"
+ git commit --allow-empty -m "empty" &&
+
+ git checkout master &&
+ echo second >>file1 &&
+ git add file1 &&
+ test_tick &&
+ git commit -m "second" &&
+ git checkout -b merge-to-empty master^ &&
+ echo second >>file1 &&
+ git add file1 &&
+ test_tick &&
+ git commit -m "will merge to empty"
'
test_expect_success 'cherry-pick an empty commit' '
@@ -40,7 +51,13 @@ test_expect_success 'index lockfile was removed' '
'
+test_expect_failure 'cherry-pick to result in empty' '
+ git checkout master^0 &&
+ test_must_fail git cherry-pick merge-to-empty
+'
+
test_expect_success 'cherry-pick a commit with an empty message' '
+ git reset --hard &&
git checkout master && {
git cherry-pick empty-branch
test "$?" = 1
--
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