aboutsummaryrefslogtreecommitdiffstats
path: root/repository
diff options
context:
space:
mode:
authorMichael Muré <batolettre@gmail.com>2020-04-12 19:40:54 +0200
committerGitHub <noreply@github.com>2020-04-12 19:40:54 +0200
commitd3fc94a650f863245052c11b5fe346786fd04dcb (patch)
tree157a21363674fd304026000c3fb748d5a5412b23 /repository
parent28c3ee3b7156f90e72a41899d8738d51d9d4eac8 (diff)
parente062d9aedfa34077757e6df13bbbbaf9cbb1a2d4 (diff)
downloadgit-bug-d3fc94a650f863245052c11b5fe346786fd04dcb.tar.gz
Merge pull request #371 from mindriot101/config-reads-includes
Supports git config includes
Diffstat (limited to 'repository')
-rw-r--r--repository/config_git.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/repository/config_git.go b/repository/config_git.go
index c4d222cf..987cf195 100644
--- a/repository/config_git.go
+++ b/repository/config_git.go
@@ -45,7 +45,7 @@ func (gc *gitConfig) StoreTimestamp(key string, value time.Time) error {
// ReadAll read all key/value pair matching the key prefix
func (gc *gitConfig) ReadAll(keyPrefix string) (map[string]string, error) {
- stdout, err := gc.repo.runGitCommand("config", gc.localityFlag, "--get-regexp", keyPrefix)
+ stdout, err := gc.repo.runGitCommand("config", gc.localityFlag, "--includes", "--get-regexp", keyPrefix)
// / \
// / ! \
@@ -74,7 +74,7 @@ func (gc *gitConfig) ReadAll(keyPrefix string) (map[string]string, error) {
}
func (gc *gitConfig) ReadString(key string) (string, error) {
- stdout, err := gc.repo.runGitCommand("config", gc.localityFlag, "--get-all", key)
+ stdout, err := gc.repo.runGitCommand("config", gc.localityFlag, "--includes", "--get-all", key)
// / \
// / ! \