summaryrefslogtreecommitdiff
path: root/diff.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-02-13 13:39:09 -0800
committerJunio C Hamano <gitster@pobox.com>2018-02-13 13:39:09 -0800
commit17c8e0b33dc6d0fc975fb4ca1d78d859e77791a6 (patch)
tree952b3f6e96430701156e8a46cdc455c7dfad5355 /diff.c
parent9bc89b17e36db31a54bc3ff16e48b5cb6beb095b (diff)
parent4e056c989f8642050973ba1aabc687979f41798c (diff)
downloadgit-17c8e0b33dc6d0fc975fb4ca1d78d859e77791a6.tar.gz
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
Diffstat (limited to 'diff.c')
-rw-r--r--diff.c1
1 files changed, 1 insertions, 0 deletions
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)