diff-highlight: use flush() helper consistently

peff · gitster · commit 009a81ed978e · 2018-03-21T10:24:19.000-07:00
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 &lt;peff@peff.net&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git 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 {

Original file line number	Diff line number	Diff line change
`@@ -46,10 +46,7 @@ sub handle_line {`
`46`	`46`	`push @added, $_;`
`47`	`47`	`}`
`48`	`48`	`else {`
`49`		`- show_hunk(\@removed, \@added);`
`50`		`- @removed = ();`
`51`		`- @added = ();`
`52`		`-`
	`49`	`+ flush();`
`53`	`50`	`$line_cb->($_);`
`54`	`51`	`$in_hunk = /^$GRAPH$COLOR[\@ ]/;`
`55`	`52`	`}`
`@@ -71,6 +68,8 @@ sub flush {`
`71`	`68`	`# Flush any queued hunk (this can happen when there is no trailing`
`72`	`69`	`# context in the final diff of the input).`
`73`	`70`	`show_hunk(\@removed, \@added);`
	`71`	`+ @removed = ();`
	`72`	`+ @added = ();`
`74`	`73`	`}`
`75`	`74`
`76`	`75`	`sub highlight_stdin {`