From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Tue, 22 Feb 2022 16:54:18 GMT
Subject: Re: [PATCH 08/12] merge-ort: provide a merge_get_conflicted_files() helper function
Message-ID: <nycvar.QRO.7.76.6.2202221751550.11118@tvgsbejvaqbjf.bet>
In-Reply-To: <nycvar.QRO.7.76.6.2202211059430.26495@tvgsbejvaqbjf.bet>

Hi Elijah,

On Mon, 21 Feb 2022, Johannes Schindelin wrote:

> [...] since `merge-tree` is a low-level tool meant to be called by
> programs rather than humans, we need to make sure that those messages
> remain machine-parseable, even if they contain file names.
>
> [...]
>
> Do you think we can switch to `sq_quote_buf_pretty()` for these messages?

Or maybe much better: use NUL to separate those messages if `-z` is passed
to `merge-tree`? That would address the issue in one elegant diff.

What do you think?

Ciao,
Dscho