remove go-gitconfig package

pkg/commands/config.go

@@ -43,13 +43,6 @@ func (c *GitCommand) colorArg() string {
 }
 
 func (c *GitCommand) GetConfigValue(key string) string {
-	value, _ := c.getLocalGitConfig(key)
-	// we get an error if the key doesn't exist which we don't care about
-
-	if value != "" {
-		return value
-	}
-
-	value, _ = c.getGlobalGitConfig(key)
-	return value
+	output, _ := c.getGitConfigValue(key)
+	return output
 }

pkg/commands/dummies.go

@@ -15,12 +15,11 @@ func NewDummyGitCommand() *GitCommand {
 // NewDummyGitCommandWithOSCommand creates a new dummy GitCommand for testing
 func NewDummyGitCommandWithOSCommand(osCommand *oscommands.OSCommand) *GitCommand {
 	return &GitCommand{
-		Log:                utils.NewDummyLog(),
-		OSCommand:          osCommand,
-		Tr:                 i18n.NewTranslationSet(utils.NewDummyLog()),
-		Config:             config.NewDummyAppConfig(),
-		getGlobalGitConfig: func(string) (string, error) { return "", nil },
-		getLocalGitConfig:  func(string) (string, error) { return "", nil },
-		removeFile:         func(string) error { return nil },
+		Log:               utils.NewDummyLog(),
+		OSCommand:         osCommand,
+		Tr:                i18n.NewTranslationSet(utils.NewDummyLog()),
+		Config:            config.NewDummyAppConfig(),
+		getGitConfigValue: func(string) (string, error) { return "", nil },
+		removeFile:        func(string) error { return nil },
 	}
 }

pkg/commands/files.go

@@ -268,7 +268,7 @@ func (c *GitCommand) ResetAndClean() error {
 // EditFile opens a file in a subprocess using whatever editor is available,
 // falling back to core.editor, VISUAL, EDITOR, then vi
 func (c *GitCommand) EditFile(filename string) (*exec.Cmd, error) {
-	editor, _ := c.getGlobalGitConfig("core.editor")
+	editor := c.GetConfigValue("core.editor")
 
 	if editor == "" {
 		editor = c.OSCommand.Getenv("VISUAL")

pkg/commands/git.go

@@ -16,7 +16,6 @@ import (
 	"github.com/jesseduffield/lazygit/pkg/i18n"
 	"github.com/jesseduffield/lazygit/pkg/utils"
 	"github.com/sirupsen/logrus"
-	gitconfig "github.com/tcnksm/go-gitconfig"
 )
 
 // this takes something like:
@@ -32,8 +31,7 @@ type GitCommand struct {
 	Repo                 *gogit.Repository
 	Tr                   *i18n.TranslationSet
 	Config               config.AppConfigurer
-	getGlobalGitConfig   func(string) (string, error)
-	getLocalGitConfig    func(string) (string, error)
+	getGitConfigValue    func(string) (string, error)
 	removeFile           func(string) error
 	DotGitDir            string
 	onSuccessfulContinue func() error
@@ -74,16 +72,15 @@ func NewGitCommand(log *logrus.Entry, osCommand *oscommands.OSCommand, tr *i18n.
 	}
 
 	gitCommand := &GitCommand{
-		Log:                log,
-		OSCommand:          osCommand,
-		Tr:                 tr,
-		Repo:               repo,
-		Config:             config,
-		getGlobalGitConfig: gitconfig.Global,
-		getLocalGitConfig:  gitconfig.Local,
-		removeFile:         os.RemoveAll,
-		DotGitDir:          dotGitDir,
-		PushToCurrent:      pushToCurrent,
+		Log:               log,
+		OSCommand:         osCommand,
+		Tr:                tr,
+		Repo:              repo,
+		Config:            config,
+		getGitConfigValue: getGitConfigValue,
+		removeFile:        os.RemoveAll,
+		DotGitDir:         dotGitDir,
+		PushToCurrent:     pushToCurrent,
 	}
 
 	gitCommand.PatchManager = patch.NewPatchManager(log, gitCommand.ApplyPatch, gitCommand.ShowFileDiff)

pkg/commands/git_test.go

@@ -700,45 +700,24 @@ func TestGitCommandMerge(t *testing.T) {
 // TestGitCommandUsingGpg is a function.
 func TestGitCommandUsingGpg(t *testing.T) {
 	type scenario struct {
-		testName           string
-		getLocalGitConfig  func(string) (string, error)
-		getGlobalGitConfig func(string) (string, error)
-		test               func(bool)
+		testName          string
+		getGitConfigValue func(string) (string, error)
+		test              func(bool)
 	}
 
 	scenarios := []scenario{
 		{
 			"Option global and local config commit.gpgsign is not set",
-			func(string) (string, error) {
-				return "", nil
-			},
-			func(string) (string, error) {
-				return "", nil
-			},
+			func(string) (string, error) { return "", nil },
 			func(gpgEnabled bool) {
 				assert.False(t, gpgEnabled)
 			},
 		},
-		{
-			"Option global config commit.gpgsign is not set, fallback on local config",
-			func(string) (string, error) {
-				return "", nil
-			},
-			func(string) (string, error) {
-				return "true", nil
-			},
-			func(gpgEnabled bool) {
-				assert.True(t, gpgEnabled)
-			},
-		},
 		{
 			"Option commit.gpgsign is true",
 			func(string) (string, error) {
 				return "True", nil
 			},
-			func(string) (string, error) {
-				return "", nil
-			},
 			func(gpgEnabled bool) {
 				assert.True(t, gpgEnabled)
 			},
@@ -748,9 +727,6 @@ func TestGitCommandUsingGpg(t *testing.T) {
 			func(string) (string, error) {
 				return "ON", nil
 			},
-			func(string) (string, error) {
-				return "", nil
-			},
 			func(gpgEnabled bool) {
 				assert.True(t, gpgEnabled)
 			},
@@ -760,9 +736,6 @@ func TestGitCommandUsingGpg(t *testing.T) {
 			func(string) (string, error) {
 				return "YeS", nil
 			},
-			func(string) (string, error) {
-				return "", nil
-			},
 			func(gpgEnabled bool) {
 				assert.True(t, gpgEnabled)
 			},
@@ -772,9 +745,6 @@ func TestGitCommandUsingGpg(t *testing.T) {
 			func(string) (string, error) {
 				return "1", nil
 			},
-			func(string) (string, error) {
-				return "", nil
-			},
 			func(gpgEnabled bool) {
 				assert.True(t, gpgEnabled)
 			},
@@ -784,8 +754,7 @@ func TestGitCommandUsingGpg(t *testing.T) {
 	for _, s := range scenarios {
 		t.Run(s.testName, func(t *testing.T) {
 			gitCmd := NewDummyGitCommand()
-			gitCmd.getGlobalGitConfig = s.getGlobalGitConfig
-			gitCmd.getLocalGitConfig = s.getLocalGitConfig
+			gitCmd.getGitConfigValue = s.getGitConfigValue
 			s.test(gitCmd.usingGpg())
 		})
 	}
@@ -794,11 +763,11 @@ func TestGitCommandUsingGpg(t *testing.T) {
 // TestGitCommandCommit is a function.
 func TestGitCommandCommit(t *testing.T) {
 	type scenario struct {
-		testName           string
-		command            func(string, ...string) *exec.Cmd
-		getGlobalGitConfig func(string) (string, error)
-		test               func(*exec.Cmd, error)
-		flags              string
+		testName          string
+		command           func(string, ...string) *exec.Cmd
+		getGitConfigValue func(string) (string, error)
+		test              func(*exec.Cmd, error)
+		flags             string
 	}
 
 	scenarios := []scenario{
@@ -875,7 +844,7 @@ func TestGitCommandCommit(t *testing.T) {
 	for _, s := range scenarios {
 		t.Run(s.testName, func(t *testing.T) {
 			gitCmd := NewDummyGitCommand()
-			gitCmd.getGlobalGitConfig = s.getGlobalGitConfig
+			gitCmd.getGitConfigValue = s.getGitConfigValue
 			gitCmd.OSCommand.Command = s.command
 			s.test(gitCmd.Commit("test", s.flags))
 		})
@@ -885,10 +854,10 @@ func TestGitCommandCommit(t *testing.T) {
 // TestGitCommandAmendHead is a function.
 func TestGitCommandAmendHead(t *testing.T) {
 	type scenario struct {
-		testName           string
-		command            func(string, ...string) *exec.Cmd
-		getGlobalGitConfig func(string) (string, error)
-		test               func(*exec.Cmd, error)
+		testName          string
+		command           func(string, ...string) *exec.Cmd
+		getGitConfigValue func(string) (string, error)
+		test              func(*exec.Cmd, error)
 	}
 
 	scenarios := []scenario{
@@ -945,7 +914,7 @@ func TestGitCommandAmendHead(t *testing.T) {
 	for _, s := range scenarios {
 		t.Run(s.testName, func(t *testing.T) {
 			gitCmd := NewDummyGitCommand()
-			gitCmd.getGlobalGitConfig = s.getGlobalGitConfig
+			gitCmd.getGitConfigValue = s.getGitConfigValue
 			gitCmd.OSCommand.Command = s.command
 			s.test(gitCmd.AmendHead())
 		})
@@ -955,12 +924,11 @@ func TestGitCommandAmendHead(t *testing.T) {
 // TestGitCommandPush is a function.
 func TestGitCommandPush(t *testing.T) {
 	type scenario struct {
-		testName           string
-		getLocalGitConfig  func(string) (string, error)
-		getGlobalGitConfig func(string) (string, error)
-		command            func(string, ...string) *exec.Cmd
-		forcePush          bool
-		test               func(error)
+		testName          string
+		getGitConfigValue func(string) (string, error)
+		command           func(string, ...string) *exec.Cmd
+		forcePush         bool
+		test              func(error)
 	}
 
 	scenarios := []scenario{
@@ -969,9 +937,6 @@ func TestGitCommandPush(t *testing.T) {
 			func(string) (string, error) {
 				return "", nil
 			},
-			func(string) (string, error) {
-				return "", nil
-			},
 			func(cmd string, args ...string) *exec.Cmd {
 				assert.EqualValues(t, "git", cmd)
 				assert.EqualValues(t, []string{"push", "--follow-tags"}, args)
@@ -988,9 +953,6 @@ func TestGitCommandPush(t *testing.T) {
 			func(string) (string, error) {
 				return "", nil
 			},
-			func(string) (string, error) {
-				return "", nil
-			},
 			func(cmd string, args ...string) *exec.Cmd {
 				assert.EqualValues(t, "git", cmd)
 				assert.EqualValues(t, []string{"push", "--follow-tags", "--force-with-lease"}, args)
@@ -1003,13 +965,10 @@ func TestGitCommandPush(t *testing.T) {
 			},
 		},
 		{
-			"Push with force disabled, follow-tags off locally",
+			"Push with force disabled, follow-tags off",
 			func(string) (string, error) {
 				return "false", nil
 			},
-			func(string) (string, error) {
-				return "", nil
-			},
 			func(cmd string, args ...string) *exec.Cmd {
 				assert.EqualValues(t, "git", cmd)
 				assert.EqualValues(t, []string{"push"}, args)
@@ -1021,33 +980,11 @@ func TestGitCommandPush(t *testing.T) {
 				assert.NoError(t, err)
 			},
 		},
-		{
-			"Push with force enabled, follow-tags off globally",
-			func(string) (string, error) {
-				return "", nil
-			},
-			func(string) (string, error) {
-				return "false", nil
-			},
-			func(cmd string, args ...string) *exec.Cmd {
-				assert.EqualValues(t, "git", cmd)
-				assert.EqualValues(t, []string{"push", "--force-with-lease"}, args)
-
-				return secureexec.Command("echo")
-			},
-			true,
-			func(err error) {
-				assert.NoError(t, err)
-			},
-		},
 		{
 			"Push with an error occurring, follow-tags on",
 			func(string) (string, error) {
 				return "", nil
 			},
-			func(string) (string, error) {
-				return "", nil
-			},
 			func(cmd string, args ...string) *exec.Cmd {
 				assert.EqualValues(t, "git", cmd)
 				assert.EqualValues(t, []string{"push", "--follow-tags"}, args)
@@ -1064,8 +1001,7 @@ func TestGitCommandPush(t *testing.T) {
 		t.Run(s.testName, func(t *testing.T) {
 			gitCmd := NewDummyGitCommand()
 			gitCmd.OSCommand.Command = s.command
-			gitCmd.getLocalGitConfig = s.getLocalGitConfig
-			gitCmd.getGlobalGitConfig = s.getGlobalGitConfig
+			gitCmd.getGitConfigValue = s.getGitConfigValue
 			err := gitCmd.Push("test", s.forcePush, "", "", func(passOrUname string) string {
 				return "\n"
 			})
@@ -1790,7 +1726,7 @@ func TestGitCommandCheckoutFile(t *testing.T) {
 func TestGitCommandDiscardOldFileChanges(t *testing.T) {
 	type scenario struct {
 		testName          string
-		getLocalGitConfig func(string) (string, error)
+		getGitConfigValue func(string) (string, error)
 		commits           []*models.Commit
 		commitIndex       int
 		fileName          string
@@ -1871,7 +1807,7 @@ func TestGitCommandDiscardOldFileChanges(t *testing.T) {
 	for _, s := range scenarios {
 		t.Run(s.testName, func(t *testing.T) {
 			gitCmd.OSCommand.Command = s.command
-			gitCmd.getLocalGitConfig = s.getLocalGitConfig
+			gitCmd.getGitConfigValue = s.getGitConfigValue
 			s.test(gitCmd.DiscardOldFileChanges(s.commits, s.commitIndex, s.fileName))
 		})
 	}
@@ -2164,11 +2100,11 @@ func TestFindDotGitDir(t *testing.T) {
 // TestEditFile is a function.
 func TestEditFile(t *testing.T) {
 	type scenario struct {
-		filename           string
-		command            func(string, ...string) *exec.Cmd
-		getenv             func(string) string
-		getGlobalGitConfig func(string) (string, error)
-		test               func(*exec.Cmd, error)
+		filename          string
+		command           func(string, ...string) *exec.Cmd
+		getenv            func(string) string
+		getGitConfigValue func(string) (string, error)
+		test              func(*exec.Cmd, error)
 	}
 
 	scenarios := []scenario{
@@ -2307,7 +2243,7 @@ func TestEditFile(t *testing.T) {
 		gitCmd := NewDummyGitCommand()
 		gitCmd.OSCommand.Command = s.command
 		gitCmd.OSCommand.Getenv = s.getenv
-		gitCmd.getGlobalGitConfig = s.getGlobalGitConfig
+		gitCmd.getGitConfigValue = s.getGitConfigValue
 		s.test(gitCmd.EditFile(s.filename))
 	}
 }

pkg/commands/gitconfig.go

@@ -0,0 +1,56 @@
+package commands
+
+import (
+	"bytes"
+	"fmt"
+	"io/ioutil"
+	"os/exec"
+	"strings"
+	"syscall"
+
+	"github.com/jesseduffield/lazygit/pkg/secureexec"
+)
+
+// including license from https://github.com/tcnksm/go-gitconfig because this file is an adaptation of that repo's code
+// Copyright (c) 2014 tcnksm
+
+// MIT License
+
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+func getGitConfigValue(key string) (string, error) {
+	gitArgs := append([]string{"config", "--get", "--null", key})
+	var stdout bytes.Buffer
+	cmd := secureexec.Command("git", gitArgs...)
+	cmd.Stdout = &stdout
+	cmd.Stderr = ioutil.Discard
+
+	err := cmd.Run()
+	if exitError, ok := err.(*exec.ExitError); ok {
+		if waitStatus, ok := exitError.Sys().(syscall.WaitStatus); ok {
+			if waitStatus.ExitStatus() == 1 {
+				return "", fmt.Errorf("the key `%s` is not found", key)
+			}
+		}
+		return "", err
+	}
+
+	return strings.TrimRight(stdout.String(), "\000"), nil
+}

pkg/commands/pull_request_test.go

@@ -162,14 +162,10 @@ func TestCreatePullRequest(t *testing.T) {
 				"invalid.work.com":   "noservice:invalid.work.com",
 				"noservice.work.com": "noservice.work.com",
 			}
-			gitCommand.getLocalGitConfig = func(path string) (string, error) {
+			gitCommand.getGitConfigValue = func(path string) (string, error) {
 				assert.Equal(t, path, "remote.origin.url")
 				return s.remoteUrl, nil
 			}
-			gitCommand.getGlobalGitConfig = func(path string) (string, error) {
-				assert.Equal(t, path, "remote.origin.url")
-				return "", nil
-			}
 			dummyPullRequest := NewPullRequest(gitCommand)
 			s.test(dummyPullRequest.Create(s.branch))
 		})