From 8f05452c60a54cf57496675bc538d1dc76fa8e92 Mon Sep 17 00:00:00 2001
From: Billy Keyes <bluekeyes@gmail.com>
Date: Wed, 10 Jun 2020 21:16:22 -0700
Subject: [PATCH] Allow unpadded days in patch headers

A closer look at the Git source shows that the rfc2822 and default
formats do not zero-pad days, so we need to accept single-digit days
when parsing. The single-digit pattern will also accept the padded
format, so there's no loss of functionality.

Change the parsing test to use single-digit values to emphasize when
padding is required and when it is not.
---
 gitdiff/patch_header.go      |  6 +++---
 gitdiff/patch_header_test.go | 42 ++++++++++++++++++------------------
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/gitdiff/patch_header.go b/gitdiff/patch_header.go
index bc0dc55..2dc05a0 100644
--- a/gitdiff/patch_header.go
+++ b/gitdiff/patch_header.go
@@ -126,10 +126,10 @@ func ParsePatchDate(s string) PatchDate {
 	const (
 		isoFormat          = "2006-01-02 15:04:05 -0700"
 		isoStrictFormat    = "2006-01-02T15:04:05-07:00"
-		rfc2822Format      = "Mon, 02 Jan 2006 15:04:05 -0700"
+		rfc2822Format      = "Mon, 2 Jan 2006 15:04:05 -0700"
 		shortFormat        = "2006-01-02"
-		defaultFormat      = "Mon Jan 02 15:04:05 2006 -0700"
-		defaultLocalFormat = "Mon Jan 02 15:04:05 2006"
+		defaultFormat      = "Mon Jan 2 15:04:05 2006 -0700"
+		defaultLocalFormat = "Mon Jan 2 15:04:05 2006"
 	)
 
 	d := PatchDate{Raw: s}
diff --git a/gitdiff/patch_header_test.go b/gitdiff/patch_header_test.go
index 3be2564..8eeabdf 100644
--- a/gitdiff/patch_header_test.go
+++ b/gitdiff/patch_header_test.go
@@ -65,72 +65,72 @@ func TestParsePatchIdentity(t *testing.T) {
 }
 
 func TestParsePatchDate(t *testing.T) {
-	expected := time.Date(2020, 04, 11, 22, 21, 23, 0, time.UTC)
+	expected := time.Date(2020, 4, 9, 8, 7, 6, 0, time.UTC)
 
 	tests := map[string]struct {
 		Input  string
 		Output PatchDate
 	}{
 		"default": {
-			Input: "Sat Apr 11 15:21:23 2020 -0700",
+			Input: "Thu Apr 9 01:07:06 2020 -0700",
 			Output: PatchDate{
 				Parsed: expected,
-				Raw:    "Sat Apr 11 15:21:23 2020 -0700",
+				Raw:    "Thu Apr 9 01:07:06 2020 -0700",
 			},
 		},
 		"defaultLocal": {
-			Input: "Sat Apr 11 15:21:23 2020",
+			Input: "Thu Apr 9 01:07:06 2020",
 			Output: PatchDate{
-				Parsed: time.Date(2020, 04, 11, 15, 21, 23, 0, time.Local),
-				Raw:    "Sat Apr 11 15:21:23 2020",
+				Parsed: time.Date(2020, 4, 9, 1, 7, 6, 0, time.Local),
+				Raw:    "Thu Apr 9 01:07:06 2020",
 			},
 		},
 		"iso": {
-			Input: "2020-04-11 15:21:23 -0700",
+			Input: "2020-04-09 01:07:06 -0700",
 			Output: PatchDate{
 				Parsed: expected,
-				Raw:    "2020-04-11 15:21:23 -0700",
+				Raw:    "2020-04-09 01:07:06 -0700",
 			},
 		},
 		"isoStrict": {
-			Input: "2020-04-11T15:21:23-07:00",
+			Input: "2020-04-09T01:07:06-07:00",
 			Output: PatchDate{
 				Parsed: expected,
-				Raw:    "2020-04-11T15:21:23-07:00",
+				Raw:    "2020-04-09T01:07:06-07:00",
 			},
 		},
 		"rfc": {
-			Input: "Sat, 11 Apr 2020 15:21:23 -0700",
+			Input: "Thu, 9 Apr 2020 01:07:06 -0700",
 			Output: PatchDate{
 				Parsed: expected,
-				Raw:    "Sat, 11 Apr 2020 15:21:23 -0700",
+				Raw:    "Thu, 9 Apr 2020 01:07:06 -0700",
 			},
 		},
 		"short": {
-			Input: "2020-04-11",
+			Input: "2020-04-09",
 			Output: PatchDate{
-				Parsed: time.Date(2020, 04, 11, 0, 0, 0, 0, time.Local),
-				Raw:    "2020-04-11",
+				Parsed: time.Date(2020, 4, 9, 0, 0, 0, 0, time.Local),
+				Raw:    "2020-04-09",
 			},
 		},
 		"raw": {
-			Input: "1586643683 -0700",
+			Input: "1586419626 -0700",
 			Output: PatchDate{
 				Parsed: expected,
-				Raw:    "1586643683 -0700",
+				Raw:    "1586419626 -0700",
 			},
 		},
 		"unix": {
-			Input: "1586643683",
+			Input: "1586419626",
 			Output: PatchDate{
 				Parsed: expected,
-				Raw:    "1586643683",
+				Raw:    "1586419626",
 			},
 		},
 		"unknownFormat": {
-			Input: "4/11/2020 15:21:23 PDT",
+			Input: "4/9/2020 01:07:06 PDT",
 			Output: PatchDate{
-				Raw: "4/11/2020 15:21:23 PDT",
+				Raw: "4/9/2020 01:07:06 PDT",
 			},
 		},
 		"empty": {