diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2020-08-18 22:02:35 +1000 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2020-08-23 14:29:18 +1000 |
| commit | f5b22d94d939b0fc1aff433686e891e0a7507950 (patch) | |
| tree | 9812c4c7f3855d7e3fe973dacf5533ef04463c3d /pkg/gui/diffing.go | |
| parent | 3c87ff4eff46449d5e697e954b3bdf01d2c76f19 (diff) | |
WIP
Diffstat (limited to 'pkg/gui/diffing.go')
| -rw-r--r-- | pkg/gui/diffing.go | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/pkg/gui/diffing.go b/pkg/gui/diffing.go index 4e88f2e8b..789552659 100644 --- a/pkg/gui/diffing.go +++ b/pkg/gui/diffing.go @@ -18,20 +18,21 @@ func (gui *Gui) exitDiffMode() error { } func (gui *Gui) renderDiff() error { + filterArg := "" + + if gui.inFilterMode() { + filterArg = fmt.Sprintf(" -- %s", gui.State.FilterPath) + } + + cmd := gui.OSCommand.ExecutableFromString( + fmt.Sprintf("git diff --color %s %s", gui.diffStr(), filterArg), + ) + task := gui.createRunPtyTask(cmd) + return gui.refreshMain(refreshMainOpts{ main: &viewUpdateOpts{ title: "Diff", - task: func() error { - filterArg := "" - if gui.inFilterMode() { - filterArg = fmt.Sprintf(" -- %s", gui.State.FilterPath) - } - - cmd := gui.OSCommand.ExecutableFromString( - fmt.Sprintf("git diff --color %s %s", gui.diffStr(), filterArg), - ) - return gui.newPtyTask("main", cmd) - }, + task: task, }, }) } |