From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: * X-Spam-ASN: AS3215 2.6.0.0/16 X-Spam-Status: No, score=1.0 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, LIST_MIRROR_RECEIVED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE shortcircuit=no autolearn=no autolearn_force=no version=3.4.2 Received: from out1.vger.email (out1.vger.email [IPv6:2620:137:e000::1:20]) by dcvr.yhbt.net (Postfix) with ESMTP id D3A9E1F9F4 for ; Wed, 2 Feb 2022 21:31:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1347557AbiBBVax (ORCPT ); Wed, 2 Feb 2022 16:30:53 -0500 Received: from pb-smtp20.pobox.com ([173.228.157.52]:53951 "EHLO pb-smtp20.pobox.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1347608AbiBBVan (ORCPT ); Wed, 2 Feb 2022 16:30:43 -0500 Received: from pb-smtp20.pobox.com (unknown [127.0.0.1]) by pb-smtp20.pobox.com (Postfix) with ESMTP id E4B0117A4E4; Wed, 2 Feb 2022 16:30:42 -0500 (EST) (envelope-from junio@pobox.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=pobox.com; h=from:to:cc :subject:references:date:message-id:mime-version:content-type; s=sasl; bh=b+RyZtSGb6kQCJ5FOqlHvQOjIfHI2TvWCmKOCbYyh4w=; b=GMEe o/XJDBsvkF0wM4ag0+dXlSuUli+uat93BQbPkMHleszU0kzt1k2hMWtHjSirWr1r nobkDSH/1MhqpE6J1yluzOeWQB2JxBc2wyLapbtLvSKhXLpUIQ6bQT59E4bc1YSD kstcxam6L9n+hRsTJE/Cgb0wBpPsy6FZO9urO4s= Received: from pb-smtp20.sea.icgroup.com (unknown [127.0.0.1]) by pb-smtp20.pobox.com (Postfix) with ESMTP id DC61E17A4E3; Wed, 2 Feb 2022 16:30:42 -0500 (EST) (envelope-from junio@pobox.com) Received: from pobox.com (unknown [104.133.2.91]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pb-smtp20.pobox.com (Postfix) with ESMTPSA id 4569217A4E2; Wed, 2 Feb 2022 16:30:39 -0500 (EST) (envelope-from junio@pobox.com) From: Junio C Hamano To: "Elijah Newren via GitGitGadget" Cc: git@vger.kernel.org, Christian Couder , Taylor Blau , Johannes Altmanninger , Ramsay Jones , Johannes Schindelin , Christian Couder , =?utf-8?Q?Ren=C3=A9?= Scharfe , =?utf-8?B?w4Z2YXIgQXJuZmrDtnLDsA==?= Bjarmason , Elijah Newren , Johannes Sixt Subject: Re: [PATCH v2 08/13] merge-tree: support including merge messages in output References: Date: Wed, 02 Feb 2022 13:30:38 -0800 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Pobox-Relay-ID: 5DE267BC-846F-11EC-BB51-C85A9F429DF0-77302942!pb-smtp20.pobox.com Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org "Elijah Newren via GitGitGadget" writes: > +By default, for a successful merge, the output from git-merge-tree is > +simply one line: > + > + > + > +Whereas for a conflicted merge, the output is by default of the form: > > > + Sounds useful. This made me wonder, as the only shuffling of the output destination in the past few steps were to send the output to some "FILE *", how you send the findings you make while coming up with the result _after_ the result. It turns out that the ORT machinery already buffers these findings in a strbuf per path, so there is no trouble doing so ;-) It still makes me wonder how the "send rename warnings to the standard output stream, instead of the standard error stream" change interacts with this change, though. That needs to be done way before you finish computing the result, and it does not seem to be buffered in-core, like per-path conflict information messages.