From c80979499a2177f3e172b6d89dabaa0bf64e81d1 Mon Sep 17 00:00:00 2001
From: Máximo Cuadros <mcuadros@gmail.com>
Date: Sun, 24 May 2020 09:15:51 +0200
Subject: Revert "Merge pull request #20 from
 quorumcontrol/feature/other-configs"

This reverts commit 3127ad9a44a2ee935502816065dfe39f494f583d, reversing
changes made to 73c52edaad2dae256be61bd1dbbab08e1092f58e.
---
 storage/filesystem/config.go | 52 ++++----------------------------------------
 1 file changed, 4 insertions(+), 48 deletions(-)

(limited to 'storage/filesystem/config.go')

diff --git a/storage/filesystem/config.go b/storage/filesystem/config.go
index dbdce54..01b35b4 100644
--- a/storage/filesystem/config.go
+++ b/storage/filesystem/config.go
@@ -5,7 +5,6 @@ import (
 	"os"
 
 	"github.com/go-git/go-git/v5/config"
-	format "github.com/go-git/go-git/v5/plumbing/format/config"
 	"github.com/go-git/go-git/v5/storage/filesystem/dotgit"
 	"github.com/go-git/go-git/v5/utils/ioutil"
 )
@@ -14,11 +13,10 @@ type ConfigStorage struct {
 	dir *dotgit.DotGit
 }
 
-func (c *ConfigStorage) Config() (*config.Config, error) {
+func (c *ConfigStorage) Config() (conf *config.Config, err error) {
 	cfg := config.NewConfig()
 
-	// local config (./.git/config)
-	f, err := c.dir.LocalConfig()
+	f, err := c.dir.Config()
 	if err != nil {
 		if os.IsNotExist(err) {
 			return cfg, nil
@@ -31,55 +29,13 @@ func (c *ConfigStorage) Config() (*config.Config, error) {
 
 	b, err := stdioutil.ReadAll(f)
 	if err != nil {
-		return cfg, err
-	}
-
-	if err = cfg.UnmarshalScoped(format.LocalScope, b); err != nil {
-		return cfg, err
-	}
-
-	// global config (~/.gitconfig)
-	f, err = c.dir.GlobalConfig()
-	if err != nil {
-		if os.IsNotExist(err) {
-			return cfg, nil
-		}
-
 		return nil, err
 	}
 
-	defer ioutil.CheckClose(f, &err)
-
-	b, err = stdioutil.ReadAll(f)
-	if err != nil {
-		return cfg, err
-	}
-
-	if err = cfg.UnmarshalScoped(format.GlobalScope, b); err != nil {
-		return cfg, err
-	}
-
-	// system config (/etc/gitconfig)
-	f, err = c.dir.SystemConfig()
-	if err != nil {
-		if os.IsNotExist(err) {
-			return cfg, nil
-		}
-
+	if err = cfg.Unmarshal(b); err != nil {
 		return nil, err
 	}
 
-	defer ioutil.CheckClose(f, &err)
-
-	b, err = stdioutil.ReadAll(f)
-	if err != nil {
-		return cfg, err
-	}
-
-	if err = cfg.UnmarshalScoped(format.SystemScope, b); err != nil {
-		return cfg, err
-	}
-
 	return cfg, err
 }
 
@@ -88,7 +44,7 @@ func (c *ConfigStorage) SetConfig(cfg *config.Config) (err error) {
 		return err
 	}
 
-	f, err := c.dir.LocalConfigWriter()
+	f, err := c.dir.ConfigWriter()
 	if err != nil {
 		return err
 	}
-- 
cgit 


From 26d02b3fec4434d663445d580497204e79284db0 Mon Sep 17 00:00:00 2001
From: Máximo Cuadros <mcuadros@gmail.com>
Date: Sun, 24 May 2020 11:22:32 +0200
Subject: config: ReadConfig and LoadConfig from scopes

---
 storage/filesystem/config.go | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

(limited to 'storage/filesystem/config.go')

diff --git a/storage/filesystem/config.go b/storage/filesystem/config.go
index 01b35b4..78a6464 100644
--- a/storage/filesystem/config.go
+++ b/storage/filesystem/config.go
@@ -1,7 +1,6 @@
 package filesystem
 
 import (
-	stdioutil "io/ioutil"
 	"os"
 
 	"github.com/go-git/go-git/v5/config"
@@ -14,29 +13,17 @@ type ConfigStorage struct {
 }
 
 func (c *ConfigStorage) Config() (conf *config.Config, err error) {
-	cfg := config.NewConfig()
-
 	f, err := c.dir.Config()
 	if err != nil {
 		if os.IsNotExist(err) {
-			return cfg, nil
+			return config.NewConfig(), nil
 		}
 
 		return nil, err
 	}
 
 	defer ioutil.CheckClose(f, &err)
-
-	b, err := stdioutil.ReadAll(f)
-	if err != nil {
-		return nil, err
-	}
-
-	if err = cfg.Unmarshal(b); err != nil {
-		return nil, err
-	}
-
-	return cfg, err
+	return config.ReadConfig(f)
 }
 
 func (c *ConfigStorage) SetConfig(cfg *config.Config) (err error) {
-- 
cgit