Re: [PATCH v2 0/8] RFC: Server side merges (no ref updating, no commit creating, no touching worktree or index)

From: Christian Couder <christian.couder@gmail.com>
Date: Jan 7, 2022, 18:46 UTC
Message-ID: <CAP8UFD1Z74yuUmzPCr6X8-i2B1zaiT8kPxNDHxK5MeHw8OcnRg@mail.gmail.com>
In-Reply-To: <pull.1114.v2.git.git.1641403655.gitgitgadget@gmail.com>

On Wed, Jan 5, 2022 at 6:27 PM Elijah Newren via GitGitGadget <gitgitgadget@gmail.com> wrote:

> This series attempts to guess what kind of output would be wanted, basically
> choosing:
>
>  * clean merge or conflict signalled via exit status

(Maybe s/signalled/signaled/)

Not sure that's the best way by default. I think it's very likely that many users will be interested in parsing the command ouput, and they might prefer that merge related errors be signaled in a different way than other errors.

>  * stdout consists solely of printing the hash of the resulting tree (though
>    that tree may include files that have conflict markers)

Maybe users will want diffs, the conflicted list and other things on stdout, as they might want to parse it anyway, and it would be a burden to have to perform diffs, or get other interesting info in a different way or using a different process or call.

Show 5 quoted lines

>  * new optional --messages flag for specifying a file where informational
>    messages (e.g. conflict notices and files involved in three-way-content
>    merges) can be written; by default, this output is simply discarded
>  * new optional --conflicted-list flag for specifying a file where the names
>    of conflicted-files can be written in a NUL-character-separated list

It would be nice if output was printed on stdout when the above flags are used without argument.

Thanks for working on this!