From: Johannes Altmanninger <aclopte@gmail.com>
Date: Sat, 01 Jan 2022 20:08:36 GMT
Subject: Re: [PATCH 6/8] merge-ort: allow update messages to be written to different file stream
Message-ID: <20220101200836.msaewswefs5uvkyq@gmail.com>
In-Reply-To: <32ad5b5c10da7204dc4a2d3ca74f8d73745925a7.1640927044.git.gitgitgadget@gmail.com>

On Fri, Dec 31, 2021 at 05:04:02AM +0000, Elijah Newren via GitGitGadget wrote:
> From: Elijah Newren <newren@gmail.com>
> 
> This modifies the new display_update_messages() function to allow
> printing to somewhere other than stdout.
> 
> Signed-off-by: Elijah Newren <newren@gmail.com>
> ---
>  merge-ort.c | 7 +++++--
>  merge-ort.h | 3 ++-
>  2 files changed, 7 insertions(+), 3 deletions(-)
> 
> diff --git a/merge-ort.c b/merge-ort.c
> index 6237e2fb7fe..86eebf39166 100644
> --- a/merge-ort.c
> +++ b/merge-ort.c
> [...]
> @@ -4271,6 +4272,8 @@ void merge_switch_to_result(struct merge_options *opt,
>  		trace2_region_leave("merge", "write_auto_merge", opt->repo);
>  	}
>  
> +	if (display_update_msgs)
> +		merge_display_update_messages(opt, result, stdout);

is it intentional that the previous patch doesn't have this call?