mirror of
https://github.com/git/git
synced 2024-07-17 11:07:55 +00:00
a6c2654f83
When rebasing with "--signoff" the commit created by "rebase --continue" after resolving conflicts or editing a commit fails to add the "Signed-off-by:" trailer. This happens because the message from the original commit is reused instead of the one that would have been used if the sequencer had not stopped for the user interaction. The correct message is stored in ctx->message and so with a couple of exceptions this is written to rebase_path_message() when stopping for user interaction instead. The exceptions are (i) "fixup" and "squash" commands where the file is written by error_failed_squash() and (ii) "edit" commands that are fast-forwarded where the original message is still reused. The latter is safe because "--signoff" will never fast-forward. Note this introduces a change in behavior as the message file now contains conflict comments. This is safe because commit_staged_changes() passes an explicit cleanup flag when not editing the message and when the message is being edited it will be cleaned up automatically. This means user now sees the same message comments in editor with "rebase --continue" as they would if they ran "git commit" themselves before continuing the rebase. It also matches the behavior of "git cherry-pick", "git merge" etc. which all list the files with merge conflicts. The tests are extended to check that all commits made after continuing a rebase have a "Signed-off-by:" trailer. Sadly there are a couple of leaks in apply.c which I've not been able to track down that mean this test file is no-longer leak free when testing "git rebase --apply --signoff" with conflicts. Reported-by: David Bimmler <david.bimmler@isovalent.com> Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
141 lines
3.1 KiB
Bash
Executable file
141 lines
3.1 KiB
Bash
Executable file
#!/bin/sh
|
|
|
|
test_description='git rebase --signoff
|
|
|
|
This test runs git rebase --signoff and make sure that it works.
|
|
'
|
|
|
|
. ./test-lib.sh
|
|
. "$TEST_DIRECTORY"/lib-rebase.sh
|
|
|
|
test_expect_success 'setup' '
|
|
git commit --allow-empty -m "Initial empty commit" &&
|
|
test_commit first file a &&
|
|
test_commit second file &&
|
|
git checkout -b conflict-branch first &&
|
|
test_commit file-2 file-2 &&
|
|
test_commit conflict file &&
|
|
test_commit third file &&
|
|
|
|
ident="$GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>" &&
|
|
|
|
# Expected commit message for initial commit after rebase --signoff
|
|
cat >expected-initial-signed <<-EOF &&
|
|
Initial empty commit
|
|
|
|
Signed-off-by: $ident
|
|
EOF
|
|
|
|
# Expected commit message after rebase --signoff
|
|
cat >expected-signed <<-EOF &&
|
|
first
|
|
|
|
Signed-off-by: $ident
|
|
EOF
|
|
|
|
# Expected commit message after conflict resolution for rebase --signoff
|
|
cat >expected-signed-conflict <<-EOF &&
|
|
third
|
|
|
|
Signed-off-by: $ident
|
|
|
|
conflict
|
|
|
|
Signed-off-by: $ident
|
|
|
|
file-2
|
|
|
|
Signed-off-by: $ident
|
|
|
|
EOF
|
|
|
|
# Expected commit message after rebase without --signoff (or with --no-signoff)
|
|
cat >expected-unsigned <<-EOF &&
|
|
first
|
|
EOF
|
|
|
|
git config alias.rbs "rebase --signoff"
|
|
'
|
|
|
|
# We configure an alias to do the rebase --signoff so that
|
|
# on the next subtest we can show that --no-signoff overrides the alias
|
|
test_expect_success 'rebase --apply --signoff adds a sign-off line' '
|
|
test_must_fail git rbs --apply second third &&
|
|
git checkout --theirs file &&
|
|
git add file &&
|
|
git rebase --continue &&
|
|
git log --format=%B -n3 >actual &&
|
|
test_cmp expected-signed-conflict actual
|
|
'
|
|
|
|
test_expect_success 'rebase --no-signoff does not add a sign-off line' '
|
|
git commit --amend -m "first" &&
|
|
git rbs --no-signoff HEAD^ &&
|
|
test_commit_message HEAD expected-unsigned
|
|
'
|
|
|
|
test_expect_success 'rebase --exec --signoff adds a sign-off line' '
|
|
test_when_finished "rm exec" &&
|
|
git rebase --exec "touch exec" --signoff first^ first &&
|
|
test_path_is_file exec &&
|
|
test_commit_message HEAD expected-signed
|
|
'
|
|
|
|
test_expect_success 'rebase --root --signoff adds a sign-off line' '
|
|
git checkout first &&
|
|
git rebase --root --keep-empty --signoff &&
|
|
test_commit_message HEAD^ expected-initial-signed &&
|
|
test_commit_message HEAD expected-signed
|
|
'
|
|
|
|
test_expect_success 'rebase -m --signoff adds a sign-off line' '
|
|
test_must_fail git rebase -m --signoff second third &&
|
|
git checkout --theirs file &&
|
|
git add file &&
|
|
GIT_EDITOR="sed -n /Conflicts:/,/^\\\$/p >actual" \
|
|
git rebase --continue &&
|
|
cat >expect <<-\EOF &&
|
|
# Conflicts:
|
|
# file
|
|
|
|
EOF
|
|
test_cmp expect actual &&
|
|
git log --format=%B -n3 >actual &&
|
|
test_cmp expected-signed-conflict actual
|
|
'
|
|
|
|
test_expect_success 'rebase -i --signoff adds a sign-off line when editing commit' '
|
|
(
|
|
set_fake_editor &&
|
|
FAKE_LINES="edit 1 edit 3 edit 2" \
|
|
git rebase -i --signoff first third
|
|
) &&
|
|
echo a >a &&
|
|
git add a &&
|
|
test_must_fail git rebase --continue &&
|
|
git checkout --ours file &&
|
|
echo b >a &&
|
|
git add a file &&
|
|
git rebase --continue &&
|
|
echo c >a &&
|
|
git add a &&
|
|
git log --format=%B -n3 >actual &&
|
|
cat >expect <<-EOF &&
|
|
conflict
|
|
|
|
Signed-off-by: $ident
|
|
|
|
third
|
|
|
|
Signed-off-by: $ident
|
|
|
|
file-2
|
|
|
|
Signed-off-by: $ident
|
|
|
|
EOF
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_done
|