1 files changed, 73 insertions, 3 deletions
diff --git a/config/config_test.go b/config/config_test.go
index 1f120c0..5cd713e 100644
--- a/config/config_test.go
+++ b/config/config_test.go
@@ -1,6 +1,9 @@
 package config
 
-import . "gopkg.in/check.v1"
+import (
+	. "gopkg.in/check.v1"
+	"gopkg.in/src-d/go-git.v4/plumbing"
+)
 
 type ConfigSuite struct{}
 
@@ -47,7 +50,8 @@ func (s *ConfigSuite) TestUnmarshall(c *C) {
 	c.Assert(cfg.Submodules["qux"].Name, Equals, "qux")
 	c.Assert(cfg.Submodules["qux"].URL, Equals, "https://github.com/foo/qux.git")
 	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"))
 }
 
 func (s *ConfigSuite) TestMarshall(c *C) {
@@ -65,6 +69,9 @@ func (s *ConfigSuite) TestMarshall(c *C) {
 	url = git@github.com:mcuadros/go-git.git
 [submodule "qux"]
 	url = https://github.com/foo/qux.git
+[branch "master"]
+	remote = origin
+	merge = refs/heads/master
 `)
 
 	cfg := NewConfig()
@@ -87,6 +94,12 @@ func (s *ConfigSuite) TestMarshall(c *C) {
 		URL:  "https://github.com/foo/qux.git",
 	}
 
+	cfg.Branches["master"] = &Branch{
+		Name:   "master",
+		Remote: "origin",
+		Merge:  "refs/heads/master",
+	}
+
 	b, err := cfg.Marshal()
 	c.Assert(err, IsNil)
 
@@ -118,6 +131,29 @@ func (s *ConfigSuite) TestUnmarshallMarshall(c *C) {
 	c.Assert(string(output), DeepEquals, string(input))
 }
 
+func (s *ConfigSuite) TestValidateConfig(c *C) {
+	config := &Config{
+		Remotes: map[string]*RemoteConfig{
+			"bar": {
+				Name: "bar",
+				URLs: []string{"http://foo/bar"},
+			},
+		},
+		Branches: map[string]*Branch{
+			"bar": {
+				Name: "bar",
+			},
+			"foo": {
+				Name:   "foo",
+				Remote: "origin",
+				Merge:  plumbing.ReferenceName("refs/heads/foo"),
+			},
+		},
+	}
+
+	c.Assert(config.Validate(), IsNil)
+}
+
 func (s *ConfigSuite) TestValidateInvalidRemote(c *C) {
 	config := &Config{
 		Remotes: map[string]*RemoteConfig{
@@ -128,7 +164,7 @@ func (s *ConfigSuite) TestValidateInvalidRemote(c *C) {
 	c.Assert(config.Validate(), Equals, ErrRemoteConfigEmptyURL)
 }
 
-func (s *ConfigSuite) TestValidateInvalidKey(c *C) {
+func (s *ConfigSuite) TestValidateInvalidRemoteKey(c *C) {
 	config := &Config{
 		Remotes: map[string]*RemoteConfig{
 			"bar": {Name: "foo"},
@@ -157,10 +193,44 @@ func (s *ConfigSuite) TestRemoteConfigValidateDefault(c *C) {
 	c.Assert(fetch[0].String(), Equals, "+refs/heads/*:refs/remotes/foo/*")
 }
 
+func (s *ConfigSuite) TestValidateInvalidBranchKey(c *C) {
+	config := &Config{
+		Branches: map[string]*Branch{
+			"foo": {
+				Name:   "bar",
+				Remote: "origin",
+				Merge:  plumbing.ReferenceName("refs/heads/bar"),
+			},
+		},
+	}
+
+	c.Assert(config.Validate(), Equals, ErrInvalid)
+}
+
+func (s *ConfigSuite) TestValidateInvalidBranch(c *C) {
+	config := &Config{
+		Branches: map[string]*Branch{
+			"bar": {
+				Name:   "bar",
+				Remote: "origin",
+				Merge:  plumbing.ReferenceName("refs/heads/bar"),
+			},
+			"foo": {
+				Name:   "foo",
+				Remote: "origin",
+				Merge:  plumbing.ReferenceName("baz"),
+			},
+		},
+	}
+
+	c.Assert(config.Validate(), Equals, errBranchInvalidMerge)
+}
+
 func (s *ConfigSuite) TestRemoteConfigDefaultValues(c *C) {
 	config := NewConfig()
 
 	c.Assert(config.Remotes, HasLen, 0)
+	c.Assert(config.Branches, HasLen, 0)
 	c.Assert(config.Submodules, HasLen, 0)
 	c.Assert(config.Raw, NotNil)
 	c.Assert(config.Pack.Window, Equals, DefaultPackWindow)