summaryrefslogtreecommitdiffstats
path: root/pkg
diff options
context:
space:
mode:
authorJesse Duffield <jessedduffield@gmail.com>2022-01-07 15:01:07 +1100
committerJesse Duffield <jessedduffield@gmail.com>2022-01-09 14:09:53 +1100
commit946a35b59de44094759fa177c0218837364c9dd7 (patch)
tree0d041c4690cd039dd0d9ffb4cfd1af1a41d99d9a /pkg
parent007235df2355bfeacc206b78e9827fff529d32a2 (diff)
remove OSCommand field
Diffstat (limited to 'pkg')
-rw-r--r--pkg/commands/git.go4
-rw-r--r--pkg/gui/branches_panel.go2
-rw-r--r--pkg/gui/commits_panel.go2
-rw-r--r--pkg/gui/pull_request_menu_panel.go2
4 files changed, 4 insertions, 6 deletions
diff --git a/pkg/commands/git.go b/pkg/commands/git.go
index 2f4c68fb8..2f38757f7 100644
--- a/pkg/commands/git.go
+++ b/pkg/commands/git.go
@@ -21,7 +21,6 @@ import (
// GitCommand is our main git interface
type GitCommand struct {
*common.Common
- OSCommand *oscommands.OSCommand
Repo *gogit.Repository
@@ -122,8 +121,7 @@ func NewGitCommandAux(
patchCommands := NewPatchCommands(cmn, cmd, rebaseCommands, commitCommands, configCommands, statusCommands, patchManager)
return &GitCommand{
- Common: cmn,
- OSCommand: osCommand,
+ Common: cmn,
Repo: repo,
diff --git a/pkg/gui/branches_panel.go b/pkg/gui/branches_panel.go
index 474ff6c50..75186baca 100644
--- a/pkg/gui/branches_panel.go
+++ b/pkg/gui/branches_panel.go
@@ -114,7 +114,7 @@ func (gui *Gui) handleCopyPullRequestURLPress() error {
return gui.surfaceError(err)
}
gui.logAction(gui.Tr.Actions.CopyPullRequestURL)
- if err := gui.GitCommand.OSCommand.CopyToClipboard(url); err != nil {
+ if err := gui.OSCommand.CopyToClipboard(url); err != nil {
return gui.surfaceError(err)
}
diff --git a/pkg/gui/commits_panel.go b/pkg/gui/commits_panel.go
index 1148e0a25..bbe3ada05 100644
--- a/pkg/gui/commits_panel.go
+++ b/pkg/gui/commits_panel.go
@@ -815,7 +815,7 @@ func (gui *Gui) handleOpenCommitInBrowser() error {
}
gui.logAction(gui.Tr.Actions.OpenCommitInBrowser)
- if err := gui.GitCommand.OSCommand.OpenLink(url); err != nil {
+ if err := gui.OSCommand.OpenLink(url); err != nil {
return gui.surfaceError(err)
}
diff --git a/pkg/gui/pull_request_menu_panel.go b/pkg/gui/pull_request_menu_panel.go
index e72f781cb..220034cc5 100644
--- a/pkg/gui/pull_request_menu_panel.go
+++ b/pkg/gui/pull_request_menu_panel.go
@@ -63,7 +63,7 @@ func (gui *Gui) createPullRequest(from string, to string) error {
gui.logAction(gui.Tr.Actions.OpenPullRequest)
- if err := gui.GitCommand.OSCommand.OpenLink(url); err != nil {
+ if err := gui.OSCommand.OpenLink(url); err != nil {
return gui.surfaceError(err)
}