1
0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-06-15 00:15:32 +02:00

use RunCommand

This commit is contained in:
Anthony HAMON
2018-09-04 06:16:19 +02:00
parent 8c67578063
commit df3e7abd68
2 changed files with 12 additions and 20 deletions

View File

@ -15,16 +15,8 @@ import (
gogit "gopkg.in/src-d/go-git.v4"
)
// ErrGitRepositoryInvalid is emitted when we run a git command in a folder
// to check if we have a valid git repository and we get an error instead
var ErrGitRepositoryInvalid = errors.New("can't find a valid git repository in current directory")
func verifyInGitRepo(runCmdWithOutput func(string) (string, error)) error {
if _, err := runCmdWithOutput("git status"); err != nil {
return ErrGitRepositoryInvalid
}
return nil
func verifyInGitRepo(runCmd func(string) error) error {
return runCmd("git status")
}
func navigateToRepoRootDirectory(stat func(string) (os.FileInfo, error), chdir func(string) error) error {
@ -81,7 +73,7 @@ func NewGitCommand(log *logrus.Entry, osCommand *OSCommand, tr *i18n.Localizer)
fs := []func() error{
func() error {
return verifyInGitRepo(osCommand.RunCommandWithOutput)
return verifyInGitRepo(osCommand.RunCommand)
},
func() error {
return navigateToRepoRootDirectory(os.Stat, os.Chdir)