diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2018-08-25 11:02:46 +1000 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2018-08-25 11:02:46 +1000 |
| commit | f24c95aedec785985dfcd98ff3997152c193bd3e (patch) | |
| tree | 9f8ac1a61cf686052f623b767e13d6d1a14e3683 /pkg/gui/view_helpers.go | |
| parent | 5628eae502ee3b4d3d72a8e4045713b637f7a764 (diff) | |
| parent | 93ab892bdd1226f9a519a938c8b28590e71e54f3 (diff) | |
Merge branch 'master' into feature/auto-updates
Diffstat (limited to 'pkg/gui/view_helpers.go')
| -rw-r--r-- | pkg/gui/view_helpers.go | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/pkg/gui/view_helpers.go b/pkg/gui/view_helpers.go index cfe985867..91d81b55e 100644 --- a/pkg/gui/view_helpers.go +++ b/pkg/gui/view_helpers.go @@ -7,6 +7,8 @@ import ( "time" "github.com/jesseduffield/gocui" + "github.com/jesseduffield/lazygit/pkg/utils" + "github.com/spkg/bom" ) var cyclableViews = []string{"status", "files", "branches", "commits", "stash"} @@ -224,7 +226,9 @@ func (gui *Gui) renderString(g *gocui.Gui, viewName, s string) error { gui.Log.Info(s) } v.Clear() - fmt.Fprint(v, s) + output := string(bom.Clean([]byte(s))) + output = utils.NormalizeLinefeeds(output) + fmt.Fprint(v, output) v.Wrap = true return nil }) |