mirror of
https://github.com/git/git
synced 2024-10-30 14:03:28 +00:00
5ff6e8afac
Fix a leak in the recent 6159e7add4 (rebase --abort: improve reflog
message, 2022-10-12). Before that commit we'd strbuf_release() the
reflog message we were formatting, but when that code was refactored
to use "ropts.head_msg" the strbuf_release() was omitted.
Ideally the three users of "ropts" in cmd_rebase() should use
different "ropts" variables, in practice they're completely separate,
as this and the other user in the "switch" statement will "goto
cleanup", which won't touch "ropts".
The third caller after the "switch" is then unreachable if we take
these two branches, so all of them are getting a "{ 0 }" init'd
"ropts".
So it's OK that we're leaving a stale pointer in "ropts.head_msg",
cleaning it up was our responsibility, and it won't be used again.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Taylor Blau <me@ttaylorr.com>
153 lines
5.3 KiB
Bash
Executable file
153 lines
5.3 KiB
Bash
Executable file
#!/bin/sh
|
|
#
|
|
# Copyright (c) 2016 Dan Aloni
|
|
# Copyright (c) 2016 Jeff King
|
|
#
|
|
|
|
test_description='per-repo forced setting of email address'
|
|
|
|
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
|
|
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
|
|
|
|
TEST_PASSES_SANITIZE_LEAK=true
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success 'setup a likely user.useConfigOnly use case' '
|
|
# we want to make sure a reflog is written, since that needs
|
|
# a non-strict ident. So be sure we have an actual commit.
|
|
test_commit foo &&
|
|
|
|
sane_unset GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL &&
|
|
sane_unset GIT_COMMITTER_NAME GIT_COMMITTER_EMAIL &&
|
|
git config user.name "test" &&
|
|
git config --global user.useConfigOnly true
|
|
'
|
|
|
|
test_expect_success 'fails committing if clone email is not set' '
|
|
test_must_fail git commit --allow-empty -m msg
|
|
'
|
|
|
|
test_expect_success 'fails committing if clone email is not set, but EMAIL set' '
|
|
test_must_fail env EMAIL=test@fail.com git commit --allow-empty -m msg
|
|
'
|
|
|
|
test_expect_success 'succeeds committing if clone email is set' '
|
|
test_config user.email "test@ok.com" &&
|
|
git commit --allow-empty -m msg
|
|
'
|
|
|
|
test_expect_success 'succeeds cloning if global email is not set' '
|
|
git clone . clone
|
|
'
|
|
|
|
test_expect_success 'set up rebase scenarios' '
|
|
# temporarily enable an actual ident for this setup
|
|
test_config user.email foo@example.com &&
|
|
test_commit new &&
|
|
git branch side-without-commit HEAD^ &&
|
|
git checkout -b side-with-commit HEAD^ &&
|
|
test_commit side
|
|
'
|
|
|
|
test_expect_success 'fast-forward rebase does not care about ident' '
|
|
git checkout -B tmp side-without-commit &&
|
|
git rebase main
|
|
'
|
|
|
|
test_expect_success 'non-fast-forward rebase refuses to write commits' '
|
|
test_when_finished "git rebase --abort || true" &&
|
|
git checkout -B tmp side-with-commit &&
|
|
test_must_fail git rebase main
|
|
'
|
|
|
|
test_expect_success 'fast-forward rebase does not care about ident (interactive)' '
|
|
git checkout -B tmp side-without-commit &&
|
|
git rebase -i main
|
|
'
|
|
|
|
test_expect_success 'non-fast-forward rebase refuses to write commits (interactive)' '
|
|
test_when_finished "git rebase --abort || true" &&
|
|
git checkout -B tmp side-with-commit &&
|
|
test_must_fail git rebase -i main
|
|
'
|
|
|
|
test_expect_success 'noop interactive rebase does not care about ident' '
|
|
git checkout -B tmp side-with-commit &&
|
|
git rebase -i HEAD^
|
|
'
|
|
|
|
test_expect_success 'author.name overrides user.name' '
|
|
test_config user.name user &&
|
|
test_config user.email user@example.com &&
|
|
test_config author.name author &&
|
|
test_commit author-name-override-user &&
|
|
echo author user@example.com > expected-author &&
|
|
echo user user@example.com > expected-committer &&
|
|
git log --format="%an %ae" -1 > actual-author &&
|
|
git log --format="%cn %ce" -1 > actual-committer &&
|
|
test_cmp expected-author actual-author &&
|
|
test_cmp expected-committer actual-committer
|
|
'
|
|
|
|
test_expect_success 'author.email overrides user.email' '
|
|
test_config user.name user &&
|
|
test_config user.email user@example.com &&
|
|
test_config author.email author@example.com &&
|
|
test_commit author-email-override-user &&
|
|
echo user author@example.com > expected-author &&
|
|
echo user user@example.com > expected-committer &&
|
|
git log --format="%an %ae" -1 > actual-author &&
|
|
git log --format="%cn %ce" -1 > actual-committer &&
|
|
test_cmp expected-author actual-author &&
|
|
test_cmp expected-committer actual-committer
|
|
'
|
|
|
|
test_expect_success 'committer.name overrides user.name' '
|
|
test_config user.name user &&
|
|
test_config user.email user@example.com &&
|
|
test_config committer.name committer &&
|
|
test_commit committer-name-override-user &&
|
|
echo user user@example.com > expected-author &&
|
|
echo committer user@example.com > expected-committer &&
|
|
git log --format="%an %ae" -1 > actual-author &&
|
|
git log --format="%cn %ce" -1 > actual-committer &&
|
|
test_cmp expected-author actual-author &&
|
|
test_cmp expected-committer actual-committer
|
|
'
|
|
|
|
test_expect_success 'committer.email overrides user.email' '
|
|
test_config user.name user &&
|
|
test_config user.email user@example.com &&
|
|
test_config committer.email committer@example.com &&
|
|
test_commit committer-email-override-user &&
|
|
echo user user@example.com > expected-author &&
|
|
echo user committer@example.com > expected-committer &&
|
|
git log --format="%an %ae" -1 > actual-author &&
|
|
git log --format="%cn %ce" -1 > actual-committer &&
|
|
test_cmp expected-author actual-author &&
|
|
test_cmp expected-committer actual-committer
|
|
'
|
|
|
|
test_expect_success 'author and committer environment variables override config settings' '
|
|
test_config user.name user &&
|
|
test_config user.email user@example.com &&
|
|
test_config author.name author &&
|
|
test_config author.email author@example.com &&
|
|
test_config committer.name committer &&
|
|
test_config committer.email committer@example.com &&
|
|
GIT_AUTHOR_NAME=env_author && export GIT_AUTHOR_NAME &&
|
|
GIT_AUTHOR_EMAIL=env_author@example.com && export GIT_AUTHOR_EMAIL &&
|
|
GIT_COMMITTER_NAME=env_commit && export GIT_COMMITTER_NAME &&
|
|
GIT_COMMITTER_EMAIL=env_commit@example.com && export GIT_COMMITTER_EMAIL &&
|
|
test_commit env-override-conf &&
|
|
echo env_author env_author@example.com > expected-author &&
|
|
echo env_commit env_commit@example.com > expected-committer &&
|
|
git log --format="%an %ae" -1 > actual-author &&
|
|
git log --format="%cn %ce" -1 > actual-committer &&
|
|
sane_unset GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL &&
|
|
sane_unset GIT_COMMITTER_NAME GIT_COMMITTER_EMAIL &&
|
|
test_cmp expected-author actual-author &&
|
|
test_cmp expected-committer actual-committer
|
|
'
|
|
|
|
test_done
|