From: Elijah Newren <newren@xxxxxxxxx>
This modifies the new display_update_messages() function to allow
printing to somewhere other than stdout. It also consolidates the
location of the diff_warn_rename_limit() message with the rest of the
CONFLICT and other update messages to all go to the same stream.
Signed-off-by: Elijah Newren <newren@xxxxxxxxx>
---
merge-ort.c | 9 +++++----
merge-ort.h | 3 ++-
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/merge-ort.c b/merge-ort.c
index 82d2faf5bf9..d28d1721d14 100644
--- a/merge-ort.c
+++ b/merge-ort.c
@@ -4236,7 +4236,8 @@ static int record_conflicted_index_entries(struct merge_options *opt)
}
void merge_display_update_messages(struct merge_options *opt,
- struct merge_result *result)
+ struct merge_result *result,
+ FILE *stream)
{
struct merge_options_internal *opti = result->priv;
struct hashmap_iter iter;
@@ -4263,13 +4264,13 @@ void merge_display_update_messages(struct merge_options *opt,
for (i = 0; i < olist.nr; ++i) {
struct strbuf *sb = olist.items[i].util;
- printf("%s", sb->buf);
+ strbuf_write(sb, stream);
}
string_list_clear(&olist, 0);
/* Also include needed rename limit adjustment now */
diff_warn_rename_limit("merge.renamelimit",
- opti->renames.needed_limit, 0, stderr);
+ opti->renames.needed_limit, 0, stream);
trace2_region_leave("merge", "display messages", opt->repo);
}
@@ -4313,7 +4314,7 @@ void merge_switch_to_result(struct merge_options *opt,
}
if (display_update_msgs)
- merge_display_update_messages(opt, result);
+ merge_display_update_messages(opt, result, stdout);
merge_finalize(opt, result);
}
diff --git a/merge-ort.h b/merge-ort.h
index e5aec45b18f..d643b47cb7c 100644
--- a/merge-ort.h
+++ b/merge-ort.h
@@ -86,7 +86,8 @@ void merge_switch_to_result(struct merge_options *opt,
* so only call this when bypassing merge_switch_to_result().
*/
void merge_display_update_messages(struct merge_options *opt,
- struct merge_result *result);
+ struct merge_result *result,
+ FILE *stream);
/* Do needed cleanup when not calling merge_switch_to_result() */
void merge_finalize(struct merge_options *opt,
--
gitgitgadget
