Merge pull request #57 from uoli/fix-filemode-change

add support for file mode changes only

Author: mrnugget

diff/diff_test.go

@@ -338,6 +338,21 @@ func TestParseMultiFileDiffHeaders(t *testing.T) {
 				},
 			},
 		},
+		{
+			filename: "sample_multi_file_filemode_change.diff",
+			wantDiffs: []*FileDiff{
+				{
+					OrigName: "a/sample.sh",
+					NewName:  "b/sample.sh",
+					Extended: []string{"diff --git a/sample.sh b/sample.sh", "old mode 100755", "new mode 100644"},
+				},
+				{
+					OrigName: "a/sample2.sh",
+					NewName:  "b/sample2.sh",
+					Extended: []string{"diff --git a/sample2.sh b/sample2.sh", "old mode 100755", "new mode 100644"},
+				},
+			},
+		},
 		{
 			filename: "sample_multi_file_rename.diff",
 			wantDiffs: []*FileDiff{

diff/parse.go

@@ -363,6 +363,19 @@ func handleEmpty(fd *FileDiff) (wasEmpty bool) {
 		return false
 	}
 	switch {
+	case (lineCount == 3 || lineCount == 4 && strings.HasPrefix(fd.Extended[3], "Binary files ") || lineCount > 4 && strings.HasPrefix(fd.Extended[3], "GIT binary patch")) &&
+		strings.HasPrefix(fd.Extended[1], "old mode ") && strings.HasPrefix(fd.Extended[2], "new mode "):
+
+		names := strings.SplitN(fd.Extended[0][len("diff --git "):], " ", 2)
+		fd.OrigName, err = strconv.Unquote(names[0])
+		if err != nil {
+			fd.OrigName = names[0]
+		}
+		fd.NewName, err = strconv.Unquote(names[1])
+		if err != nil {
+			fd.NewName = names[1]
+		}
+		return true
 	case (lineCount == 3 || lineCount == 4 && strings.HasPrefix(fd.Extended[3], "Binary files ") || lineCount > 4 && strings.HasPrefix(fd.Extended[3], "GIT binary patch")) &&
 		strings.HasPrefix(fd.Extended[1], "new file mode "):
 

diff/testdata/sample_multi_file_filemode_change.diff

@@ -0,0 +1,6 @@
+diff --git a/sample.sh b/sample.sh
+old mode 100755
+new mode 100644
+diff --git a/sample2.sh b/sample2.sh
+old mode 100755
+new mode 100644