don't specify --path in gitutil.Config and specify --bool when gettin…

…g ghq.completeUser

gitutil/git.go

@@ -14,12 +14,12 @@ import (
 // ConfigSingle fetches single git-config variable.
 // returns an empty string and no error if no variable is found with the given key.
 func ConfigSingle(key string) (string, error) {
-	return Config("--get", key)
+	return Config("--path", "--get", key)
 }
 
 // ConfigAll fetches git-config variable of multiple values.
 func ConfigAll(key string) ([]string, error) {
-	value, err := Config("--get-all", key)
+	value, err := Config("--path", "--get-all", key)
 	if err != nil {
 		return nil, err
 	}
@@ -34,7 +34,7 @@ func ConfigAll(key string) ([]string, error) {
 
 // Config invokes 'git config' and handles some errors properly.
 func Config(args ...string) (string, error) {
-	gitArgs := append([]string{"config", "--path", "--null"}, args...)
+	gitArgs := append([]string{"config", "--null"}, args...)
 	cmd := exec.Command("git", gitArgs...)
 	cmd.Stderr = os.Stderr
 

remote_repository.go

@@ -108,7 +108,7 @@ func (repo *OtherRepository) VCS() (*VCSBackend, *url.URL) {
 		// (in gitconfig:)
 		//     [ghq "https://ghe.example.com/"]
 		//     vcs = github
-		vcs, err := gitutil.Config("--get-urlmatch", "ghq.vcs", repo.URL().String())
+		vcs, err := gitutil.Config("--path", "--get-urlmatch", "ghq.vcs", repo.URL().String())
 		if err != nil {
 			logger.Log("error", err.Error())
 		}

url.go

@@ -74,7 +74,7 @@ func convertGitURLHTTPToSSH(url *url.URL) (*url.URL, error) {
 }
 
 func fillUsernameToPath(path string) (string, error) {
-	completeUser, err := gitutil.ConfigSingle("ghq.completeUser")
+	completeUser, err := gitutil.Config("--bool", "--get", "ghq.completeUser")
 	if err != nil {
 		return path, err
 	}