a3ec9eaf38
In commitb00bf1c9a8("git-rebase: make --allow-empty-message the default", 2018-06-27), several arguments were given for transplanting empty commits without halting and asking the user for confirmation on each commit. These arguments were incomplete because the logic clearly assumed the only cases under consideration were transplanting of commits with empty messages (see the comment about "There are two sources for commits with empty messages). It didn't discuss or even consider rewords, squashes, etc. where the user is explicitly asked for a new commit message and provides an empty one. (My bad, I totally should have thought about that at the time, but just didn't.) Rewords and squashes are significantly different, though, as described by SZEDER: Let's suppose you start an interactive rebase, choose a commit to squash, save the instruction sheet, rebase fires up your editor, and then you notice that you mistakenly chose the wrong commit to squash. What do you do, how do you abort? Before [that commit] you could clear the commit message, exit the editor, and then rebase would say "Aborting commit due to empty commit message.", and you get to run 'git rebase --abort', and start over. But [since that commit, ...] saving the commit message as is would let rebase continue and create a bunch of unnecessary objects, and then you would have to use the reflog to return to the pre-rebase state. Also, he states: The instructions in the commit message template, which is shown for 'reword' and 'squash', too, still say... # Please enter the commit message for your changes. Lines starting # with '#' will be ignored, and an empty message aborts the commit. These are sound arguments that when editing commit messages during a sequencer operation, that if the commit message is empty then the operation should halt and ask the user to correct. The arguments in commitb00bf1c9a8(referenced above) still apply when transplanting previously created commits with empty commit messages, so the sequencer should not halt for those. Furthermore, all rationale so far applies equally for cherry-pick as for rebase. Therefore, make the code default to --allow-empty-message when transplanting an existing commit, and to default to halting when the user is asked to edit a commit message and provides an empty one -- for both rebase and cherry-pick. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
100 lines
2.4 KiB
Bash
Executable File
100 lines
2.4 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
test_description='test cherry-picking an empty commit'
|
|
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success setup '
|
|
|
|
echo first > file1 &&
|
|
git add file1 &&
|
|
test_tick &&
|
|
git commit -m "first" &&
|
|
|
|
git checkout -b empty-message-branch &&
|
|
echo third >> file1 &&
|
|
git add file1 &&
|
|
test_tick &&
|
|
git commit --allow-empty-message -m "" &&
|
|
|
|
git checkout master &&
|
|
git checkout -b empty-change-branch &&
|
|
test_tick &&
|
|
git commit --allow-empty -m "empty"
|
|
|
|
'
|
|
|
|
test_expect_success 'cherry-pick an empty commit' '
|
|
git checkout master &&
|
|
test_expect_code 1 git cherry-pick empty-change-branch
|
|
'
|
|
|
|
test_expect_success 'index lockfile was removed' '
|
|
test ! -f .git/index.lock
|
|
'
|
|
|
|
test_expect_success 'cherry-pick a commit with an empty message' '
|
|
test_when_finished "git reset --hard empty-message-branch~1" &&
|
|
git checkout master &&
|
|
git cherry-pick empty-message-branch
|
|
'
|
|
|
|
test_expect_success 'index lockfile was removed' '
|
|
test ! -f .git/index.lock
|
|
'
|
|
|
|
test_expect_success 'cherry-pick a commit with an empty message with --allow-empty-message' '
|
|
git checkout -f master &&
|
|
git cherry-pick --allow-empty-message empty-message-branch
|
|
'
|
|
|
|
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-change-branch
|
|
'
|
|
|
|
test_expect_success 'cherry pick an empty non-ff commit with --allow-empty' '
|
|
git checkout master &&
|
|
git cherry-pick --allow-empty empty-change-branch
|
|
'
|
|
|
|
test_expect_success 'cherry pick with --keep-redundant-commits' '
|
|
git checkout master &&
|
|
git cherry-pick --keep-redundant-commits HEAD^
|
|
'
|
|
|
|
test_expect_success 'cherry-pick a commit that becomes no-op (prep)' '
|
|
git checkout master &&
|
|
git branch fork &&
|
|
echo foo >file2 &&
|
|
git add file2 &&
|
|
test_tick &&
|
|
git commit -m "add file2 on master" &&
|
|
|
|
git checkout fork &&
|
|
echo foo >file2 &&
|
|
git add file2 &&
|
|
test_tick &&
|
|
git commit -m "add file2 on the side"
|
|
'
|
|
|
|
test_expect_success 'cherry-pick a no-op without --keep-redundant' '
|
|
git reset --hard &&
|
|
git checkout fork^0 &&
|
|
test_must_fail git cherry-pick master
|
|
'
|
|
|
|
test_expect_success 'cherry-pick a no-op with --keep-redundant' '
|
|
git reset --hard &&
|
|
git checkout fork^0 &&
|
|
git cherry-pick --keep-redundant-commits master &&
|
|
git show -s --format=%s >actual &&
|
|
echo "add file2 on master" >expect &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_done
|