Merge pull request #783 from maguro/refspec-src

Fix RefSpec.Src()

Author: orirawlings

config/refspec.go

@@ -62,7 +62,13 @@ func (s RefSpec) IsDelete() bool {
 // Src return the src side.
 func (s RefSpec) Src() string {
 	spec := string(s)
-	start := strings.Index(spec, refSpecForce) + 1
+
+	var start int
+	if s.IsForceUpdate() {
+		start = 1
+	} else {
+		start = 0
+	}
 	end := strings.Index(spec, refSpecSeparator)
 
 	return spec[start:end]

config/refspec_test.go

@@ -62,18 +62,37 @@ func (s *RefSpecSuite) TestRefSpecSrc(c *C) {
 	spec := RefSpec("refs/heads/*:refs/remotes/origin/*")
 	c.Assert(spec.Src(), Equals, "refs/heads/*")
 
+	spec = RefSpec("+refs/heads/*:refs/remotes/origin/*")
+	c.Assert(spec.Src(), Equals, "refs/heads/*")
+
 	spec = RefSpec(":refs/heads/master")
 	c.Assert(spec.Src(), Equals, "")
+
+	spec = RefSpec("refs/heads/love+hate:refs/heads/love+hate")
+	c.Assert(spec.Src(), Equals, "refs/heads/love+hate")
+
+	spec = RefSpec("+refs/heads/love+hate:refs/heads/love+hate")
+	c.Assert(spec.Src(), Equals, "refs/heads/love+hate")
 }
 
 func (s *RefSpecSuite) TestRefSpecMatch(c *C) {
 	spec := RefSpec("refs/heads/master:refs/remotes/origin/master")
 	c.Assert(spec.Match(plumbing.ReferenceName("refs/heads/foo")), Equals, false)
 	c.Assert(spec.Match(plumbing.ReferenceName("refs/heads/master")), Equals, true)
 
+	spec = RefSpec("+refs/heads/master:refs/remotes/origin/master")
+	c.Assert(spec.Match(plumbing.ReferenceName("refs/heads/foo")), Equals, false)
+	c.Assert(spec.Match(plumbing.ReferenceName("refs/heads/master")), Equals, true)
+
 	spec = RefSpec(":refs/heads/master")
 	c.Assert(spec.Match(plumbing.ReferenceName("")), Equals, true)
 	c.Assert(spec.Match(plumbing.ReferenceName("refs/heads/master")), Equals, false)
+
+	spec = RefSpec("refs/heads/love+hate:heads/love+hate")
+	c.Assert(spec.Match(plumbing.ReferenceName("refs/heads/love+hate")), Equals, true)
+
+	spec = RefSpec("+refs/heads/love+hate:heads/love+hate")
+	c.Assert(spec.Match(plumbing.ReferenceName("refs/heads/love+hate")), Equals, true)
 }
 
 func (s *RefSpecSuite) TestRefSpecMatchGlob(c *C) {