diff options
author | Junio C Hamano <gitster@pobox.com> | 2018-03-23 00:24:09 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-03-23 00:24:09 +0300 |
commit | b32221935e82d74d653212339442606d98aa7594 (patch) | |
tree | 00ae4ab4af1cfd85abbda3ea80abfedb428a6365 /diff.c | |
parent | 573ce039f3147d381c81201070ae48b8651e7dda (diff) | |
parent | 4e056c989f8642050973ba1aabc687979f41798c (diff) |
Merge branch 'nd/diff-flush-before-warning' into maint
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.c | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -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) |