diff options
| author | Santiago M. Mola <santi@mola.io> | 2017-07-24 10:51:01 +0200 |
|---|---|---|
| committer | Santiago M. Mola <santi@mola.io> | 2017-08-01 13:01:54 +0200 |
| commit | 9488c59834f6a2591910b7b360721cec2c16c548 (patch) | |
| tree | fea051f6cf08a62aad12e32b2240aa837be22628 /storage | |
| parent | 7b08a3005480a50f0f4290aff8f3702085d5e30d (diff) | |
| download | go-git-9488c59834f6a2591910b7b360721cec2c16c548.tar.gz | |
config: multiple values in RemoteConfig (URLs and Fetch)
* Change `URL string` to `URL []string` in `RemoteConfig`, since
git allows multiple URLs per remote. See:
http://marc.info/?l=git&m=116231242118202&w=2
* Fix marshalling of multiple fetch refspecs.
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/filesystem/config_test.go | 6 | ||||
| -rw-r--r-- | storage/test/storage_suite.go | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/storage/filesystem/config_test.go b/storage/filesystem/config_test.go index 1b812e6..4226b33 100644 --- a/storage/filesystem/config_test.go +++ b/storage/filesystem/config_test.go @@ -5,6 +5,7 @@ import ( "os" "github.com/src-d/go-git-fixtures" + "gopkg.in/src-d/go-git.v4/config" "gopkg.in/src-d/go-git.v4/storage/filesystem/internal/dotgit" . "gopkg.in/check.v1" @@ -39,9 +40,8 @@ func (s *ConfigSuite) TestRemotes(c *C) { c.Assert(remotes, HasLen, 1) remote := remotes["origin"] c.Assert(remote.Name, Equals, "origin") - c.Assert(remote.URL, Equals, "https://github.com/git-fixtures/basic") - c.Assert(remote.Fetch, HasLen, 1) - c.Assert(remote.Fetch[0].String(), Equals, "+refs/heads/*:refs/remotes/origin/*") + c.Assert(remote.URLs, DeepEquals, []string{"https://github.com/git-fixtures/basic"}) + c.Assert(remote.Fetch, DeepEquals, []config.RefSpec{config.RefSpec("+refs/heads/*:refs/remotes/origin/*")}) } func (s *ConfigSuite) TearDownTest(c *C) { diff --git a/storage/test/storage_suite.go b/storage/test/storage_suite.go index 7cb0fe3..ac1baa0 100644 --- a/storage/test/storage_suite.go +++ b/storage/test/storage_suite.go @@ -351,7 +351,7 @@ func (s *BaseStorageSuite) TestSetConfigAndConfig(c *C) { expected.Core.IsBare = true expected.Remotes["foo"] = &config.RemoteConfig{ Name: "foo", - URL: "http://foo/bar.git", + URLs: []string{"http://foo/bar.git"}, } err := s.Storer.SetConfig(expected) |