From: Junio C Hamano Date: Tue, 13 Feb 2018 21:39:09 +0000 (-0800) Subject: Merge branch 'nd/diff-flush-before-warning' X-Git-Tag: v2.17.0-rc0~125 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/17c8e0b33dc6d0fc975fb4ca1d78d859e77791a6?hp=9bc89b17e36db31a54bc3ff16e48b5cb6beb095b Merge branch 'nd/diff-flush-before-warning' 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 index e5c5cc4605..21c3838b25 100644 --- 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)