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

gitster · gitster · commit b32221935e82 · 2018-03-22T14:24:09.000-07: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
@@ -5454,6 +5454,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
`@@ -5454,6 +5454,7 @@ N_("you may want to set your %s variable to at least "`
`5454`	`5454`
`5455`	`5455`	`void diff_warn_rename_limit(const char *varname, int needed, int degraded_cc)`
`5456`	`5456`	`{`
	`5457`	`+ fflush(stdout);`
`5457`	`5458`	`if (degraded_cc)`
`5458`	`5459`	`warning(_(degrade_cc_to_c_warning));`
`5459`	`5460`	`else if (needed)`