Merge branch 'jk/diff-highlight-blank-match-fix'

gitster · gitster · commit 033591569064 · 2020-09-25T15:25:42.000-07:00
"diff-highlight" (in contrib/) had a logic to flush its output upon
seeing a blank line but the way it detected a blank line was broken.

* jk/diff-highlight-blank-match-fix:
  diff-highlight: correctly match blank lines for flush
diff --git a/contrib/diff-highlight/DiffHighlight.pm b/contrib/diff-highlight/DiffHighlight.pm
@@ -112,7 +112,7 @@ sub handle_line {
 	# Since we can receive arbitrary input, there's no optimal
 	# place to flush. Flushing on a blank line is a heuristic that
 	# happens to match git-log output.
-	if (!length) {
+	if (/^$/) {
 		$flush_cb->();
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ sub handle_line {`
`112`	`112`	`# Since we can receive arbitrary input, there's no optimal`
`113`	`113`	`# place to flush. Flushing on a blank line is a heuristic that`
`114`	`114`	`# happens to match git-log output.`
`115`		`- if (!length) {`
	`115`	`+ if (/^$/) {`
`116`	`116`	`$flush_cb->();`
`117`	`117`	`}`
`118`	`118`	`}`