On Sat, Jun 16, 2018 at 12:08 PM Elijah Newren <newren@xxxxxxxxx> wrote:
> Subject: [PATCH] sequencer: do not squash 'reword' commits when we hit
> conflicts
> [...]
> Signed-off-by: Elijah Newren <newren@xxxxxxxxx>
> ---
> diff --git a/t/t3423-rebase-reword.sh b/t/t3423-rebase-reword.sh
> @@ -0,0 +1,44 @@
> +test_expect_success 'reword comes after a conflict preserves commit' '
s/comes//
> + git checkout stuff^0 &&
> +
> + set_fake_editor &&
> + test_must_fail env FAKE_LINES="reword 2" \
> + git rebase -i -v master &&
If some command fails between here and "git rebase --continue" below,
then the test will exit with an in-progress (dangling) rebase, which
could confuse tests added later to this script. I wonder, therefore,
if it would make sense to insert the following cleanup before "git
rebase -i":
test_when_finished "reset_rebase" &&
> + 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
> +'
