[PATCH 6/7] diff-highlight: use flush() helper consistently
- From
Jeff King <peff@peff.net>
- Date
- Mar 21, 2018, 05:56 UTC
- Message-ID
- <20180321055636.GA15674@sigill.intra.peff.net>
- In-Reply-To
- <20180321054718.GA13936@sigill.intra.peff.net>
The current flush() helper only shows the queued diff but does not clear the queue. This is conceptually a bug, but it works because we only call it once at the end of the program.
Let's teach it to clear the queue, which will let us use it in more places (one for now, but more in future patches).
Signed-off-by: Jeff King <peff@peff.net> --- contrib/diff-highlight/DiffHighlight.pm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/contrib/diff-highlight/DiffHighlight.pm b/contrib/diff-highlight/DiffHighlight.pm index 663992e530..e07cd5931d 100644 --- a/contrib/diff-highlight/DiffHighlight.pm +++ b/contrib/diff-highlight/DiffHighlight.pm @@ -46,10 +46,7 @@ sub handle_line { push @added, $_; } else { - show_hunk(\@removed, \@added); - @removed = (); - @added = (); - + flush(); $line_cb->($_); $in_hunk = /^$GRAPH*$COLOR*[\@ ]/; } @@ -71,6 +68,8 @@ sub flush { # Flush any queued hunk (this can happen when there is no trailing # context in the final diff of the input). show_hunk(\@removed, \@added); + @removed = (); + @added = (); } sub highlight_stdin {
-- 2.17.0.rc0.402.ged0b3fd1ee