@@ -6377,17 +6377,20 @@ static const char rename_limit_advice[] =
N_("you may want to set your %s variable to at least "
"%d and retry the command.");
-void diff_warn_rename_limit(const char *varname, int needed, int degraded_cc)
+void diff_warn_rename_limit(const char *varname, int needed, int degraded_cc,
+ FILE *out)
{
fflush(stdout);
if (degraded_cc)
- warning(_(degrade_cc_to_c_warning));
+ warning_fp(out, _(degrade_cc_to_c_warning));
else if (needed)
- warning(_(rename_limit_warning));
+ warning_fp(out, _(rename_limit_warning));
else
return;
+
+
if (0 < needed)
- warning(_(rename_limit_advice), varname, needed);
+ warning_fp(out, _(rename_limit_advice), varname, needed);
}
static void create_filepairs_for_header_only_notifications(struct diff_options *o)
@@ -6870,7 +6873,7 @@ int diff_result_code(struct diff_options *opt, int status)
diff_warn_rename_limit("diff.renameLimit",
opt->needed_rename_limit,
- opt->degraded_cc_to_c);
+ opt->degraded_cc_to_c, stderr);
if (!opt->flags.exit_with_status &&
!(opt->output_format & DIFF_FORMAT_CHECKDIFF))
return status;
@@ -597,7 +597,8 @@ void diffcore_fix_diff_index(void);
int diff_queue_is_empty(struct diff_options *o);
void diff_flush(struct diff_options*);
void diff_free(struct diff_options*);
-void diff_warn_rename_limit(const char *varname, int needed, int degraded_cc);
+void diff_warn_rename_limit(const char *varname, int needed, int degraded_cc,
+ FILE *out);
/* diff-raw status letters */
#define DIFF_STATUS_ADDED 'A'
@@ -4305,7 +4305,7 @@ void merge_switch_to_result(struct merge_options *opt,
/* Also include needed rename limit adjustment now */
diff_warn_rename_limit("merge.renamelimit",
- opti->renames.needed_limit, 0);
+ opti->renames.needed_limit, 0, stderr);
trace2_region_leave("merge", "display messages", opt->repo);
}
@@ -3738,7 +3738,8 @@ static void merge_finalize(struct merge_options *opt)
strbuf_release(&opt->obuf);
if (show(opt, 2))
diff_warn_rename_limit("merge.renamelimit",
- opt->priv->needed_rename_limit, 0);
+ opt->priv->needed_rename_limit, 0,
+ stderr);
FREE_AND_NULL(opt->priv);
}