Merge branch 'nd/diff-flush-before-warning'

gitster · gitster · commit 17c8e0b33dc6 · 2018-02-13T13:39:09.000-08:00
Avoid showing a warning message in the middle of a line of "git
diff" output.

* nd/diff-flush-before-warning:
  diff.c: flush stdout before printing rename warnings
diff --git a/diff.c b/diff.c
@@ -5471,6 +5471,7 @@ N_("you may want to set your %s variable to at least "
 
 void diff_warn_rename_limit(const char *varname, int needed, int degraded_cc)
 {
+	fflush(stdout);
 	if (degraded_cc)
 		warning(_(degrade_cc_to_c_warning));
 	else if (needed)

Original file line number	Diff line number	Diff line change
`@@ -5471,6 +5471,7 @@ N_("you may want to set your %s variable to at least "`
`5471`	`5471`
`5472`	`5472`	`void diff_warn_rename_limit(const char *varname, int needed, int degraded_cc)`
`5473`	`5473`	`{`
	`5474`	`+ fflush(stdout);`
`5474`	`5475`	`if (degraded_cc)`
`5475`	`5476`	`warning(_(degrade_cc_to_c_warning));`
`5476`	`5477`	`else if (needed)`