diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2021-04-10 16:05:21 +1000 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2021-04-11 17:07:49 +1000 |
| commit | bfad972f0c75bb0fb4a60cf6848c1ab205254d87 (patch) | |
| tree | 3cf26baa02c0233c45db7b66e4709989ea31edbe /pkg/gui | |
| parent | bb918b579a3073d786fda83a2bc11c602e442aa0 (diff) | |
fix bug where mixed reset is actually a soft reset
Diffstat (limited to 'pkg/gui')
| -rw-r--r-- | pkg/gui/workspace_reset_options_panel.go | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/pkg/gui/workspace_reset_options_panel.go b/pkg/gui/workspace_reset_options_panel.go index 1346d2f91..701aecf08 100644 --- a/pkg/gui/workspace_reset_options_panel.go +++ b/pkg/gui/workspace_reset_options_panel.go @@ -21,7 +21,7 @@ func (gui *Gui) handleCreateResetMenu() error { red.Sprint(nukeStr), }, onPress: func() error { - if err := gui.GitCommand.ResetAndClean(); err != nil { + if err := gui.GitCommand.WithSpan("Nuke working tree").ResetAndClean(); err != nil { return gui.surfaceError(err) } @@ -34,7 +34,7 @@ func (gui *Gui) handleCreateResetMenu() error { red.Sprint("git checkout -- ."), }, onPress: func() error { - if err := gui.GitCommand.DiscardAnyUnstagedFileChanges(); err != nil { + if err := gui.GitCommand.WithSpan("Discard unstaged file changes").DiscardAnyUnstagedFileChanges(); err != nil { return gui.surfaceError(err) } @@ -47,7 +47,7 @@ func (gui *Gui) handleCreateResetMenu() error { red.Sprint("git clean -fd"), }, onPress: func() error { - if err := gui.GitCommand.RemoveUntrackedFiles(); err != nil { + if err := gui.GitCommand.WithSpan("Remove untracked files").RemoveUntrackedFiles(); err != nil { return gui.surfaceError(err) } @@ -60,7 +60,7 @@ func (gui *Gui) handleCreateResetMenu() error { red.Sprint("git reset --soft HEAD"), }, onPress: func() error { - if err := gui.GitCommand.ResetSoft("HEAD"); err != nil { + if err := gui.GitCommand.WithSpan("Soft reset").ResetSoft("HEAD"); err != nil { return gui.surfaceError(err) } @@ -73,7 +73,7 @@ func (gui *Gui) handleCreateResetMenu() error { red.Sprint("git reset --mixed HEAD"), }, onPress: func() error { - if err := gui.GitCommand.ResetSoft("HEAD"); err != nil { + if err := gui.GitCommand.WithSpan("Mixed reset").ResetMixed("HEAD"); err != nil { return gui.surfaceError(err) } @@ -86,7 +86,7 @@ func (gui *Gui) handleCreateResetMenu() error { red.Sprint("git reset --hard HEAD"), }, onPress: func() error { - if err := gui.GitCommand.ResetHard("HEAD"); err != nil { + if err := gui.GitCommand.WithSpan("Hard reset").ResetHard("HEAD"); err != nil { return gui.surfaceError(err) } |