diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-09-25 15:25:42 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-09-25 15:25:42 -0700 |
| commit | 033591569064cb6063b66bf9bb8ffefc0c3b9508 (patch) | |
| tree | 380dfbd310af4664b912c01d9e63c706f2f2d378 /contrib | |
| parent | b5847b9fab0aedc3b2642ccd123da7dd95da1376 (diff) | |
| parent | 579789dbced8f9aee987fc4d609f5f92d32f9d26 (diff) | |
| download | git-033591569064cb6063b66bf9bb8ffefc0c3b9508.tar.gz | |
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
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/diff-highlight/DiffHighlight.pm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/diff-highlight/DiffHighlight.pm b/contrib/diff-highlight/DiffHighlight.pm index e2589922a6..376f577737 100644 --- 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->(); } } |