sysutils/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-07-30 03:23:08 +03:00
Code Activity

when panicking due to malformed gitconfig, show a more useful error

Browse Source
This commit is contained in:
Jesse Duffield
2018-08-28 18:01:53 +10:00
parent db1d5328f2
commit 320ccdb22a
3 changed files with 27 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
pkg/commands/git.go
View File

@ -8,6 +8,7 @@ import (
"strings"
"github.com/jesseduffield/gocui"
"github.com/jesseduffield/lazygit/pkg/i18n"
"github.com/jesseduffield/lazygit/pkg/utils"
"github.com/sirupsen/logrus"
gitconfig "github.com/tcnksm/go-gitconfig"
@ -20,13 +21,15 @@ type GitCommand struct {
OSCommand *OSCommand
Worktree *gogit.Worktree
Repo *gogit.Repository
Tr *i18n.Localizer
}
// NewGitCommand it runs git commands
func NewGitCommand(log *logrus.Entry, osCommand *OSCommand) (*GitCommand, error) {
func NewGitCommand(log *logrus.Entry, osCommand *OSCommand, tr *i18n.Localizer) (*GitCommand, error) {
gitCommand := &GitCommand{
Log: log,
OSCommand: osCommand,
Tr: tr,
}
return gitCommand, nil
}
@ -35,7 +38,10 @@ func NewGitCommand(log *logrus.Entry, osCommand *OSCommand) (*GitCommand, error)
func (c *GitCommand) SetupGit() {
c.verifyInGitRepo()
c.navigateToRepoRootDirectory()
c.setupWorktree()
if err := c.setupWorktree(); err != nil {
c.Log.Error(err)
panic(err)
}
}
// GetStashEntries stash entryies
@ -159,18 +165,23 @@ func (c *GitCommand) navigateToRepoRootDirectory() {
}
}
func (c *GitCommand) setupWorktree() {
func (c *GitCommand) setupWorktree() error {
r, err := gogit.PlainOpen(".")
if err != nil {
panic(err)
if strings.Contains(err.Error(), `unquoted '\' must be followed by new line`) {
errorMessage := c.Tr.SLocalize("GitconfigParseErr")
return errors.New(errorMessage)
}
return err
}
c.Repo = r
w, err := r.Worktree()
if err != nil {
panic(err)
return err
}
c.Worktree = w
return nil
}
// ResetHard does the equivalent of `git reset --hard HEAD`