diff options
author | Zaq? Wiedmann <zaquestion@gmail.com> | 2018-08-28 17:32:29 -0700 |
---|---|---|
committer | Zaq? Wiedmann <zaquestion@gmail.com> | 2018-08-29 11:48:33 -0700 |
commit | 14d9faa61e2d38d31593c8536121d814947240fc (patch) | |
tree | 2277a8608f6f664982d0fede8189c17993dd5fec /config | |
parent | 005d5dc961a7053d88da53536f4a5eb4c305529b (diff) | |
download | go-git-14d9faa61e2d38d31593c8536121d814947240fc.tar.gz |
config: add commentChar to core config struct
Signed-off-by: Zaq? Wiedmann <zaquestion@gmail.com>
Diffstat (limited to 'config')
-rw-r--r-- | config/config.go | 5 | ||||
-rw-r--r-- | config/config_test.go | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/config/config.go b/config/config.go index ce6506d..a637f6d 100644 --- a/config/config.go +++ b/config/config.go @@ -40,6 +40,9 @@ type Config struct { IsBare bool // Worktree is the path to the root of the working tree. Worktree string + // CommentChar is the character indicating the start of a + // comment for commands like commit and tag + CommentChar string } Pack struct { @@ -113,6 +116,7 @@ const ( urlKey = "url" bareKey = "bare" worktreeKey = "worktree" + commentCharKey = "commentChar" windowKey = "window" mergeKey = "merge" @@ -151,6 +155,7 @@ func (c *Config) unmarshalCore() { } c.Core.Worktree = s.Options.Get(worktreeKey) + c.Core.CommentChar = s.Options.Get(commentCharKey) } func (c *Config) unmarshalPack() error { diff --git a/config/config_test.go b/config/config_test.go index 5cd713e..fe73de8 100644 --- a/config/config_test.go +++ b/config/config_test.go @@ -13,6 +13,7 @@ func (s *ConfigSuite) TestUnmarshall(c *C) { input := []byte(`[core] bare = true worktree = foo + commentchar = bar [pack] window = 20 [remote "origin"] @@ -38,6 +39,7 @@ func (s *ConfigSuite) TestUnmarshall(c *C) { c.Assert(cfg.Core.IsBare, Equals, true) c.Assert(cfg.Core.Worktree, Equals, "foo") + c.Assert(cfg.Core.CommentChar, Equals, "bar") c.Assert(cfg.Pack.Window, Equals, uint(20)) c.Assert(cfg.Remotes, HasLen, 2) c.Assert(cfg.Remotes["origin"].Name, Equals, "origin") |