Merge pull request #272 from briandealwis/i271

aaron-prindle · web-flow · commit e700f7669088 · 2018-11-02T16:25:28.000-07:00
Split lines prior to diffing
diff --git a/util/diff_utils.go b/util/diff_utils.go
@@ -167,8 +167,8 @@ func DiffFile(image1, image2 *pkgutil.Image, filename string) (*FileNameDiff, er
 	}
 
 	//Carry on with diffing, make string array for difflib requirements
-	image1Contents := []string{string(*image1FileContents)}
-	image2Contents := []string{string(*image2FileContents)}
+	image1Contents := difflib.SplitLines(string(*image1FileContents))
+	image2Contents := difflib.SplitLines(string(*image2FileContents))
 
 	//Run diff
 	diff := difflib.UnifiedDiff{

Original file line number	Diff line number	Diff line change
`@@ -167,8 +167,8 @@ func DiffFile(image1, image2 pkgutil.Image, filename string) (FileNameDiff, er`
`167`	`167`	`}`
`168`	`168`
`169`	`169`	`//Carry on with diffing, make string array for difflib requirements`
`170`		`- image1Contents := []string{string(*image1FileContents)}`
`171`		`- image2Contents := []string{string(*image2FileContents)}`
	`170`	`+ image1Contents := difflib.SplitLines(string(*image1FileContents))`
	`171`	`+ image2Contents := difflib.SplitLines(string(*image2FileContents))`
`172`	`172`
`173`	`173`	`//Run diff`
`174`	`174`	`diff := difflib.UnifiedDiff{`