Merge pull request #1 from k0ral/master

fix: Support for more kinds of binary headers

Author: zricethezav

gitdiff/binary.go

@@ -6,10 +6,13 @@ import (
 	"fmt"
 	"io"
 	"io/ioutil"
+	"regexp"
 	"strconv"
 	"strings"
 )
 
+var binaryRegexp = regexp.MustCompile(`^Binary files (/dev/null|a/(.+)|"a/(.+)") and (/dev/null|b/(.+)|"b/(.+)") differ\s*$`)
+
 func (p *parser) ParseBinaryFragments(f *File) (n int, err error) {
 	isBinary, hasData, err := p.ParseBinaryMarker()
 	if err != nil || !isBinary {
@@ -56,7 +59,9 @@ func (p *parser) ParseBinaryMarker() (isBinary bool, hasData bool, err error) {
 	case "Binary files differ\n":
 	case "Files differ\n":
 	default:
-		return false, false, nil
+		if !binaryRegexp.MatchString(p.Line(0)) {
+			return false, false, nil
+		}
 	}
 
 	if err = p.Next(); err != nil && err != io.EOF {

gitdiff/binary_test.go

@@ -30,6 +30,26 @@ func TestParseBinaryMarker(t *testing.T) {
 			IsBinary: false,
 			HasData:  false,
 		},
+		"binaryPatchCreated": {
+			Input:    "Binary files /dev/null and b/path/to/file.ext differ\n",
+			IsBinary: true,
+			HasData:  false,
+		},
+		"binaryPatchModified": {
+			Input:    "Binary files a/path/to/file.ext and b/path/to/file.ext differ\n",
+			IsBinary: true,
+			HasData:  false,
+		},
+		"binaryPatchModifiedQuoted": {
+			Input:    "Binary files \"a/path/to/file.ext\" and \"b/path/to/file.ext\" differ\n",
+			IsBinary: true,
+			HasData:  false,
+		},
+		"binaryPatchDeleted": {
+			Input:    "Binary files a/path/to/file.ext and /dev/null differ\n",
+			IsBinary: true,
+			HasData:  false,
+		},
 	}
 
 	for name, test := range tests {