mirror of
https://github.com/git/git.git
synced 2024-11-27 12:03:55 +08:00
a9279c6785
Ever since commit18633e1a22("rebase -i: use the rebase--helper builtin", 2017-02-09), when a commit marked as 'reword' in an interactive rebase has conflicts and fails to apply, when the rebase is resumed that commit will be squashed into its parent with its commit message taken. The issue can be understood better by looking at commit56dc3ab04b("sequencer (rebase -i): implement the 'edit' command", 2017-01-02), which introduced error_with_patch() for the edit command. For the edit command, it needs to stop the rebase whether or not the patch applies cleanly. If the patch does apply cleanly, then when it resumes it knows it needs to amend all changes into the previous commit. If it does not apply cleanly, then the changes should not be amended. Thus, it passes !res (success of applying the 'edit' commit) to error_with_patch() for the to_amend flag. The problematic line of code actually came from commit04efc8b57c("sequencer (rebase -i): implement the 'reword' command", 2017-01-02). Note that to get to this point in the code: * !!res (i.e. patch application failed) * item->command < TODO_SQUASH * item->command != TODO_EDIT * !is_fixup(item->command) [i.e. not squash or fixup] So that means this can only be a failed patch application that is either a pick, revert, or reword. We only need to amend HEAD when rewording the root commit or a commit that has been fast-forwarded, for any of the other cases we want a new commit, so we should not set the to_amend flag. Helped-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Original-patch-by: Elijah Newren <newren@gmail.com> Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
49 lines
1.1 KiB
Bash
Executable File
49 lines
1.1 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
test_description='git rebase interactive with rewording'
|
|
|
|
. ./test-lib.sh
|
|
|
|
. "$TEST_DIRECTORY"/lib-rebase.sh
|
|
|
|
test_expect_success 'setup' '
|
|
test_commit master file-1 test &&
|
|
|
|
git checkout -b stuff &&
|
|
|
|
test_commit feature_a file-2 aaa &&
|
|
test_commit feature_b file-2 ddd
|
|
'
|
|
|
|
test_expect_success 'reword without issues functions as intended' '
|
|
test_when_finished "reset_rebase" &&
|
|
|
|
git checkout stuff^0 &&
|
|
|
|
set_fake_editor &&
|
|
FAKE_LINES="pick 1 reword 2" FAKE_COMMIT_MESSAGE="feature_b_reworded" \
|
|
git rebase -i -v master &&
|
|
|
|
test "$(git log -1 --format=%B)" = "feature_b_reworded" &&
|
|
test $(git rev-list --count HEAD) = 3
|
|
'
|
|
|
|
test_expect_success 'reword after a conflict preserves commit' '
|
|
test_when_finished "reset_rebase" &&
|
|
|
|
git checkout stuff^0 &&
|
|
|
|
set_fake_editor &&
|
|
test_must_fail env FAKE_LINES="reword 2" \
|
|
git rebase -i -v master &&
|
|
|
|
git checkout --theirs file-2 &&
|
|
git add file-2 &&
|
|
FAKE_COMMIT_MESSAGE="feature_b_reworded" git rebase --continue &&
|
|
|
|
test "$(git log -1 --format=%B)" = "feature_b_reworded" &&
|
|
test $(git rev-list --count HEAD) = 2
|
|
'
|
|
|
|
test_done
|