mirror of
https://github.com/git/git.git
synced 2024-10-30 13:57:54 +01:00
1e461c4f1f
Since the very inception of interactive-rebase in 1b1dce4
(Teach rebase an interactive mode, 2007-06-25), there has
been a preemptive check, before looking at any commits, to
see whether the user has a valid name/email combination.
This is convenient, because it means that we abort the
operation before even beginning (rather than just
complaining that we are unable to pick a particular commit).
However, it does the wrong thing when the rebase does not
actually need to generate any new commits (e.g., a
fast-forward with no commits to pick, or one where the base
stays the same, and we just pick the same commits without
rewriting anything). In this case it may complain about the
lack of ident, even though one would not be needed to
complete the operation.
This may seem like mere nit-picking, but because interactive
rebase underlies the "preserve-merges" rebase, somebody who
has set "pull.rebase" to "preserve" cannot make even a
fast-forward pull without a valid ident, as we bail before
even realizing the fast-forward nature.
This commit drops the extra ident check entirely. This means
we rely on individual commands that generate commit objects
to complain. So we will continue to notice and prevent cases
that actually do create commits, but with one important
difference: we fail while actually executing the "pick"
operations, and leave the rebase in a conflicted, half-done
state.
In some ways this is less convenient, but in some ways it is
more so; the user can then manually commit or even "git
rebase --continue" after setting up their ident (or
providing it as a one-off on the command line).
Reported-by: Dakota Hawkins <dakotahawkins@gmail.com>
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
86 lines
2.5 KiB
Bash
Executable file
86 lines
2.5 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'
|
|
|
|
. ./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 master
|
|
'
|
|
|
|
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 master
|
|
'
|
|
|
|
test_expect_success 'fast-forward rebase does not care about ident (interactive)' '
|
|
git checkout -B tmp side-without-commit &&
|
|
git rebase -i master
|
|
'
|
|
|
|
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 master
|
|
'
|
|
|
|
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 'fast-forward rebase does not care about ident (preserve)' '
|
|
git checkout -B tmp side-without-commit &&
|
|
git rebase -p master
|
|
'
|
|
|
|
test_expect_success 'non-fast-forward rebase refuses to write commits (preserve)' '
|
|
test_when_finished "git rebase --abort || true" &&
|
|
git checkout -B tmp side-with-commit &&
|
|
test_must_fail git rebase -p master
|
|
'
|
|
|
|
test_done
|