go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2024-12-04 10:34:55 +02:00
Code Issues Releases Activity

Override GIT_SEQUENCE_EDITOR for rebase commands

Browse Source 
I noticed that `$GIT_SEQUENCE_EDITOR` is overridden in `PrepareInteractiveRebaseCommand`
but not in `runSkipEditorCommand`.

Before this change, some commands such as `SquashAllAboveFixupCommits`
would not work when a different sequence editor, e.g.
[git-interactive-rebase-tool](https://github.com/MitMaro/git-interactive-rebase-tool)
is configured.
This commit is contained in:
Paul Horn 2023-01-01 04:33:58 +01:00
parent 1bb138c79c
commit bc7873144e
No known key found for this signature in database
GPG Key ID: 9361C6F901723B81
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/commands/git_commands/rebase.go
View File

@ -332,6 +332,7 @@ func (self *RebaseCommands) runSkipEditorCommand(cmdObj oscommands.ICmdObj) erro
AddEnvVars( AddEnvVars(
daemon.DaemonKindEnvKey+"="+string(daemon.ExitImmediately), daemon.DaemonKindEnvKey+"="+string(daemon.ExitImmediately),
"GIT_EDITOR="+lazyGitPath, "GIT_EDITOR="+lazyGitPath,
"GIT_SEQUENCE_EDITOR="+lazyGitPath,
"EDITOR="+lazyGitPath, "EDITOR="+lazyGitPath,
"VISUAL="+lazyGitPath, "VISUAL="+lazyGitPath,
). ).

1
pkg/commands/git_commands/rebase_test.go
View File

@ -62,6 +62,7 @@ func TestRebaseSkipEditorCommand(t *testing.T) {
`^VISUAL=.*$`, `^VISUAL=.*$`,
`^EDITOR=.*$`, `^EDITOR=.*$`,
`^GIT_EDITOR=.*$`, `^GIT_EDITOR=.*$`,
`^GIT_SEQUENCE_EDITOR=.*$`,
"^" + daemon.DaemonKindEnvKey + "=" + string(daemon.ExitImmediately) + "$", "^" + daemon.DaemonKindEnvKey + "=" + string(daemon.ExitImmediately) + "$",
} { } {
regexStr := regexStr regexStr := regexStr