kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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

"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
maint
Junio C Hamano 2020-09-25 15:25:42 -07:00
parent b5847b9fab 579789dbce
commit 0335915690
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/diff-highlight/DiffHighlight.pm
View File

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