Merge pull request #320 from lupine/318-fix-timezone-parsing

mcuadros · web-flow · commit 31a249d0d5b7 · 2017-03-31T15:19:36.000+02:00
Work around a Go bug when parsing timezones
diff --git a/plumbing/object/object.go b/plumbing/object/object.go
@@ -138,7 +138,12 @@ func (s *Signature) decodeTimeAndTimeZone(b []byte) {
 		return
 	}
 
-	tl, err := time.Parse("-0700", string(b[tzStart:tzStart+timeZoneLength]))
+	// Include a dummy year in this time.Parse() call to avoid a bug in Go:
+	// https://github.com/golang/go/issues/19750
+	//
+	// Parsing the timezone with no other details causes the tl.Location() call
+	// below to return time.Local instead of the parsed zone in some cases
+	tl, err := time.Parse("2006 -0700", "1970 "+string(b[tzStart:tzStart+timeZoneLength]))
 	if err != nil {
 		return
 	}

Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,12 @@ func (s *Signature) decodeTimeAndTimeZone(b []byte) {`
`138`	`138`	`return`
`139`	`139`	`}`
`140`	`140`
`141`		`- tl, err := time.Parse("-0700", string(b[tzStart:tzStart+timeZoneLength]))`
	`141`	`+ // Include a dummy year in this time.Parse() call to avoid a bug in Go:`
	`142`	`+ // https://github.com/golang/go/issues/19750`
	`143`	`+ //`
	`144`	`+ // Parsing the timezone with no other details causes the tl.Location() call`
	`145`	`+ // below to return time.Local instead of the parsed zone in some cases`
	`146`	`+ tl, err := time.Parse("2006 -0700", "1970 "+string(b[tzStart:tzStart+timeZoneLength]))`
`142`	`147`	`if err != nil {`
`143`	`148`	`return`
`144`	`149`	`}`