development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-07-16 10:38:05 +00:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

implicit interactive rebase: don't run sequence editor

Browse source 
If GIT_SEQUENCE_EDITOR is set then rebase runs it when executing
implicit interactive rebases which are supposed to appear
non-interactive to the user. Fix this by setting GIT_SEQUENCE_EDITOR=:
rather than GIT_EDITOR=:. A couple of tests relied on the old behavior
so they are updated to work with the new regime.

Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Phillip Wood 2019-01-28 10:27:56 +00:00 committed by Junio C Hamano
parent 0d0ac3826a
commit 891d4a0313
5 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
builtin/rebase.c
View file

@ -354,7 +354,8 @@ static int run_specific_rebase(struct rebase_options *opts)
argv_array_pushf(&child.env_array, "GIT_CHERRY_PICK_HELP=%s",
resolvemsg);
if (!(opts->flags & REBASE_INTERACTIVE_EXPLICIT)) {
argv_array_push(&child.env_array, "GIT_EDITOR=:");
argv_array_push(&child.env_array,
"GIT_SEQUENCE_EDITOR=:");
opts->autosquash = 0;
}
@ -475,7 +476,7 @@ static int run_specific_rebase(struct rebase_options *opts)
if (is_interactive(opts) &&
!(opts->flags & REBASE_INTERACTIVE_EXPLICIT)) {
strbuf_addstr(&script_snippet,
"GIT_EDITOR=:; export GIT_EDITOR; ");
"GIT_SEQUENCE_EDITOR=:; export GIT_SEQUENCE_EDITOR; ");
opts->autosquash = 0;
}

4
git-legacy-rebase.sh
View file

@ -168,8 +168,8 @@ run_interactive () {
run_specific_rebase () {
if [ "$interactive_rebase" = implied ]; then
GIT_EDITOR=:
export GIT_EDITOR
GIT_SEQUENCE_EDITOR=:
export GIT_SEQUENCE_EDITOR
autosquash=
fi

5
t/t3404-rebase-interactive.sh
View file

@ -156,6 +156,11 @@ test_expect_success 'rebase -i with exec of inexistent command' '
! grep "Maybe git-rebase is broken" actual
'
test_expect_success 'implicit interactive rebase does not invoke sequence editor' '
test_when_finished "git rebase --abort ||:" &&
GIT_SEQUENCE_EDITOR="echo bad >" git rebase -x"echo one" @^
'
test_expect_success 'no changes are a nop' '
git checkout branch2 &&
set_fake_editor &&

2
t/t3430-rebase-merges.sh
View file

@ -125,7 +125,7 @@ test_expect_success '`reset` refuses to overwrite untracked files' '
: >dont-overwrite-untracked.t &&
echo "reset refs/tags/dont-overwrite-untracked" >script-from-scratch &&
test_config sequence.editor \""$PWD"/replace-editor.sh\" &&
test_must_fail git rebase -r HEAD &&
test_must_fail git rebase -ir HEAD &&
git rebase --abort
'

10
t/t7505-prepare-commit-msg-hook.sh
View file

@ -215,7 +215,7 @@ test_expect_success 'with hook and editor (merge)' '
test_rebase () {
expect=$1 &&
mode=$2 &&
test_expect_$expect C_LOCALE_OUTPUT "with hook (rebase $mode)" '
test_expect_$expect C_LOCALE_OUTPUT "with hook (rebase ${mode:--i})" '
test_when_finished "\
git rebase --abort
git checkout -f master
@ -225,7 +225,7 @@ test_rebase () {
GIT_EDITOR="\"$FAKE_EDITOR\"" &&
(
export GIT_SEQUENCE_EDITOR GIT_EDITOR &&
test_must_fail git rebase $mode b &&
test_must_fail git rebase -i $mode b &&
echo x >a &&
git add a &&
test_must_fail git rebase --continue &&
@ -241,18 +241,18 @@ test_rebase () {
git add b &&
git rebase --continue
) &&
if test $mode = -p # reword amended after pick
if test "$mode" = -p # reword amended after pick
then
n=18
else
n=17
fi &&
git log --pretty=%s -g -n$n HEAD@{1} >actual &&
test_cmp "$TEST_DIRECTORY/t7505/expected-rebase$mode" actual
test_cmp "$TEST_DIRECTORY/t7505/expected-rebase${mode:--i}" actual
'
}
test_rebase success -i
test_rebase success
test_have_prereq !REBASE_P || test_rebase success -p
test_expect_success 'with hook (cherry-pick)' '