* [PATCH] implicit interactive rebase: don't run sequence editor
@ 2019-01-28 10:27 Phillip Wood
2019-01-28 18:25 ` Junio C Hamano
0 siblings, 1 reply; 2+ messages in thread
From: Phillip Wood @ 2019-01-28 10:27 UTC (permalink / raw)
To: Git Mailing List; +Cc: Johannes Schindelin, Junio C Hamano, Phillip Wood
From: Phillip Wood <phillip.wood@dunelm.org.uk>
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>
---
builtin/rebase.c | 5 +++--
git-legacy-rebase.sh | 4 ++--
t/t3404-rebase-interactive.sh | 5 +++++
t/t3430-rebase-merges.sh | 2 +-
t/t7505-prepare-commit-msg-hook.sh | 10 +++++-----
5 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/builtin/rebase.c b/builtin/rebase.c
index 00de70365e..7c11b4ac7f 100644
--- a/builtin/rebase.c
+++ b/builtin/rebase.c
@@ -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;
}
diff --git a/git-legacy-rebase.sh b/git-legacy-rebase.sh
index b4c7dbfa57..41f7799bb5 100755
--- a/git-legacy-rebase.sh
+++ b/git-legacy-rebase.sh
@@ -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
diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh
index 7a440e08d8..2b961745cc 100755
--- a/t/t3404-rebase-interactive.sh
+++ b/t/t3404-rebase-interactive.sh
@@ -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 &&
diff --git a/t/t3430-rebase-merges.sh b/t/t3430-rebase-merges.sh
index cc5646836f..4c69255ee6 100755
--- a/t/t3430-rebase-merges.sh
+++ b/t/t3430-rebase-merges.sh
@@ -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
'
diff --git a/t/t7505-prepare-commit-msg-hook.sh b/t/t7505-prepare-commit-msg-hook.sh
index ebfcad9c4c..ba8bd1b514 100755
--- a/t/t7505-prepare-commit-msg-hook.sh
+++ b/t/t7505-prepare-commit-msg-hook.sh
@@ -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)' '
--
2.20.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] implicit interactive rebase: don't run sequence editor
2019-01-28 10:27 [PATCH] implicit interactive rebase: don't run sequence editor Phillip Wood
@ 2019-01-28 18:25 ` Junio C Hamano
0 siblings, 0 replies; 2+ messages in thread
From: Junio C Hamano @ 2019-01-28 18:25 UTC (permalink / raw)
To: Phillip Wood; +Cc: Git Mailing List, Johannes Schindelin, Phillip Wood
Phillip Wood <phillip.wood@talktalk.net> writes:
> From: Phillip Wood <phillip.wood@dunelm.org.uk>
>
> 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>
> ---
Good eyes, and an excellent execution to override the more specific
one ;-)
> builtin/rebase.c | 5 +++--
> git-legacy-rebase.sh | 4 ++--
> t/t3404-rebase-interactive.sh | 5 +++++
> t/t3430-rebase-merges.sh | 2 +-
> t/t7505-prepare-commit-msg-hook.sh | 10 +++++-----
> 5 files changed, 16 insertions(+), 10 deletions(-)
>
> diff --git a/builtin/rebase.c b/builtin/rebase.c
> index 00de70365e..7c11b4ac7f 100644
> --- a/builtin/rebase.c
> +++ b/builtin/rebase.c
> @@ -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;
> }
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-01-28 18:25 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-01-28 10:27 [PATCH] implicit interactive rebase: don't run sequence editor Phillip Wood
2019-01-28 18:25 ` Junio C Hamano
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).