diff options
| author | Máximo Cuadros <mcuadros@gmail.com> | 2021-12-10 06:51:49 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-10 06:51:49 +0100 |
| commit | fe158cd6e176682e087efea9625ec5409f2956bf (patch) | |
| tree | 63afb89d42b388316d045820b44972f54e0b8f01 /config/config_test.go | |
| parent | 589a41ceedfa89e1ff334a969d1beb28cb731de9 (diff) | |
| parent | 39f97ab86a776dd8acd58a79a660d0cfdb7068c0 (diff) | |
| download | go-git-fe158cd6e176682e087efea9625ec5409f2956bf.tar.gz | |
Merge branch 'master' into jc-push-atomic
Diffstat (limited to 'config/config_test.go')
| -rw-r--r-- | config/config_test.go | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/config/config_test.go b/config/config_test.go index 6f0242d..91f7df2 100644 --- a/config/config_test.go +++ b/config/config_test.go @@ -50,6 +50,7 @@ func (s *ConfigSuite) TestUnmarshal(c *C) { [branch "master"] remote = origin merge = refs/heads/master + description = "Add support for branch description.\\n\\nEdit branch description: git branch --edit-description\\n" [init] defaultBranch = main [url "ssh://git@github.com/"] @@ -86,6 +87,7 @@ func (s *ConfigSuite) TestUnmarshal(c *C) { c.Assert(cfg.Submodules["qux"].Branch, Equals, "bar") c.Assert(cfg.Branches["master"].Remote, Equals, "origin") c.Assert(cfg.Branches["master"].Merge, Equals, plumbing.ReferenceName("refs/heads/master")) + c.Assert(cfg.Branches["master"].Description, Equals, "Add support for branch description.\n\nEdit branch description: git branch --edit-description\n") c.Assert(cfg.Init.DefaultBranch, Equals, "main") } @@ -111,6 +113,7 @@ func (s *ConfigSuite) TestMarshal(c *C) { [branch "master"] remote = origin merge = refs/heads/master + description = "Add support for branch description.\\n\\nEdit branch description: git branch --edit-description\\n" [url "ssh://git@github.com/"] insteadOf = https://github.com/ [init] @@ -149,9 +152,10 @@ func (s *ConfigSuite) TestMarshal(c *C) { } cfg.Branches["master"] = &Branch{ - Name: "master", - Remote: "origin", - Merge: "refs/heads/master", + Name: "master", + Remote: "origin", + Merge: "refs/heads/master", + Description: "Add support for branch description.\n\nEdit branch description: git branch --edit-description\n", } cfg.URLs["ssh://git@github.com/"] = &URL{ @@ -364,4 +368,5 @@ func (s *ConfigSuite) TestRemoveUrlOptions(c *C) { if strings.Contains(string(buf), "url") { c.Fatal("conifg should not contain any url sections") } + c.Assert(err, IsNil) } |