diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2019-02-11 22:46:27 +1100 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2019-02-11 22:46:27 +1100 |
| commit | 6430ab6ac9297142416ff4bbf6420161356742c6 (patch) | |
| tree | cdcb83f01ad23a92dae7f4be69aaaa35a8c6a19a /pkg/gui | |
| parent | 75ab8ec4d95b96fc9b8182154910609832265c3b (diff) | |
| parent | e09f3905e962be254bffb9736f88799e61fa5fcf (diff) | |
Merge branch 'master' into feature/rebasing
Diffstat (limited to 'pkg/gui')
| -rw-r--r-- | pkg/gui/commits_panel.go | 3 | ||||
| -rw-r--r-- | pkg/gui/gui.go | 7 | ||||
| -rw-r--r-- | pkg/gui/options_menu_panel.go | 2 | ||||
| -rw-r--r-- | pkg/gui/staging_panel.go | 2 |
4 files changed, 10 insertions, 4 deletions
diff --git a/pkg/gui/commits_panel.go b/pkg/gui/commits_panel.go index 53e979ac4..0c557b15d 100644 --- a/pkg/gui/commits_panel.go +++ b/pkg/gui/commits_panel.go @@ -1,9 +1,10 @@ package gui import ( - "errors" "fmt" + "github.com/go-errors/errors" + "github.com/jesseduffield/gocui" "github.com/jesseduffield/lazygit/pkg/commands" "github.com/jesseduffield/lazygit/pkg/utils" diff --git a/pkg/gui/gui.go b/pkg/gui/gui.go index 28ecdaebe..70b39529b 100644 --- a/pkg/gui/gui.go +++ b/pkg/gui/gui.go @@ -6,7 +6,6 @@ import ( // "io" // "io/ioutil" - "errors" "io/ioutil" "log" "os" @@ -14,6 +13,8 @@ import ( "strings" "time" + "github.com/go-errors/errors" + // "strings" "github.com/fatih/color" @@ -587,7 +588,9 @@ func (gui *Gui) RunWithSubprocesses() { gui.SubProcess.Stdin = nil gui.SubProcess = nil } else { - log.Panicln(err) + newErr := errors.Wrap(err, 0) + stackTrace := newErr.ErrorStack() + log.Panicln(stackTrace) } } } diff --git a/pkg/gui/options_menu_panel.go b/pkg/gui/options_menu_panel.go index f7019ed8e..307ac5700 100644 --- a/pkg/gui/options_menu_panel.go +++ b/pkg/gui/options_menu_panel.go @@ -4,6 +4,8 @@ import ( "errors" "strings" + "github.com/go-errors/errors" + "github.com/jesseduffield/gocui" ) diff --git a/pkg/gui/staging_panel.go b/pkg/gui/staging_panel.go index 777da08c2..099dd5da8 100644 --- a/pkg/gui/staging_panel.go +++ b/pkg/gui/staging_panel.go @@ -1,7 +1,7 @@ package gui import ( - "errors" + "github.com/go-errors/errors" "github.com/jesseduffield/gocui" "github.com/jesseduffield/lazygit/pkg/git" |