diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2022-01-05 11:57:32 +1100 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2022-01-07 10:52:51 +1100 |
| commit | 05fa483f4818d45b357187700079c3bdae663df2 (patch) | |
| tree | fb4fe7d3fda3e8b3e3d862c7a5e1383de456fe60 /pkg/gui/rebase_options_panel.go | |
| parent | e524e398423f8aea2961302287123085dcc5a524 (diff) | |
simplify how we log commands
Diffstat (limited to 'pkg/gui/rebase_options_panel.go')
| -rw-r--r-- | pkg/gui/rebase_options_panel.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkg/gui/rebase_options_panel.go b/pkg/gui/rebase_options_panel.go index 6cc9f113b..f5d4cdf94 100644 --- a/pkg/gui/rebase_options_panel.go +++ b/pkg/gui/rebase_options_panel.go @@ -51,7 +51,7 @@ func (gui *Gui) genericMergeCommand(command string) error { return gui.createErrorPanel(gui.Tr.NotMergingOrRebasing) } - gitCommand := gui.GitCommand.WithSpan(fmt.Sprintf("Merge/Rebase: %s", command)) + gui.logSpan(fmt.Sprintf("Merge/Rebase: %s", command)) commandType := "" switch status { @@ -65,13 +65,13 @@ func (gui *Gui) genericMergeCommand(command string) error { // it's impossible for a rebase to require a commit so we'll use a subprocess only if it's a merge if status == enums.REBASE_MODE_MERGING && command != REBASE_OPTION_ABORT && gui.UserConfig.Git.Merging.ManualCommit { - sub := gitCommand.Cmd.New("git " + commandType + " --" + command) + sub := gui.GitCommand.Cmd.New("git " + commandType + " --" + command) if sub != nil { return gui.runSubprocessWithSuspenseAndRefresh(sub) } return nil } - result := gitCommand.GenericMergeOrRebaseAction(commandType, command) + result := gui.GitCommand.GenericMergeOrRebaseAction(commandType, command) if err := gui.handleGenericMergeCommandResult(result); err != nil { return err } |