diff options
| author | Máximo Cuadros <mcuadros@gmail.com> | 2020-04-07 23:18:13 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-07 23:18:13 +0200 |
| commit | 3127ad9a44a2ee935502816065dfe39f494f583d (patch) | |
| tree | c5b7892e36ba31890e5c60571082deacf255bca7 /storage/filesystem/dotgit/dotgit_test.go | |
| parent | 73c52edaad2dae256be61bd1dbbab08e1092f58e (diff) | |
| parent | 68bffab4d6fa84260cc4287f979a6feceaf92ff8 (diff) | |
| download | go-git-3127ad9a44a2ee935502816065dfe39f494f583d.tar.gz | |
Merge pull request #20 from quorumcontrol/feature/other-configs
plumbing: format, config.Merged to allow access to local and global config
Diffstat (limited to 'storage/filesystem/dotgit/dotgit_test.go')
| -rw-r--r-- | storage/filesystem/dotgit/dotgit_test.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/storage/filesystem/dotgit/dotgit_test.go b/storage/filesystem/dotgit/dotgit_test.go index cf81c23..d57ff15 100644 --- a/storage/filesystem/dotgit/dotgit_test.go +++ b/storage/filesystem/dotgit/dotgit_test.go @@ -332,7 +332,7 @@ func (s *SuiteDotGit) TestConfig(c *C) { fs := fixtures.Basic().ByTag(".git").One().DotGit() dir := New(fs) - file, err := dir.Config() + file, err := dir.LocalConfig() c.Assert(err, IsNil) c.Assert(filepath.Base(file.Name()), Equals, "config") } @@ -345,13 +345,13 @@ func (s *SuiteDotGit) TestConfigWriteAndConfig(c *C) { fs := osfs.New(tmp) dir := New(fs) - f, err := dir.ConfigWriter() + f, err := dir.LocalConfigWriter() c.Assert(err, IsNil) _, err = f.Write([]byte("foo")) c.Assert(err, IsNil) - f, err = dir.Config() + f, err = dir.LocalConfig() c.Assert(err, IsNil) cnt, err := ioutil.ReadAll(f) |