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-Status: No, score=-3.0 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_PASS,SPF_PASS,URIBL_SBL,URIBL_SBL_A shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by dcvr.yhbt.net (Postfix) with ESMTP id 7F5F31F5AE for ; Wed, 17 Jun 2020 21:17:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727039AbgFQVRF (ORCPT ); Wed, 17 Jun 2020 17:17:05 -0400 Received: from pb-smtp1.pobox.com ([64.147.108.70]:52519 "EHLO pb-smtp1.pobox.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726906AbgFQVRD (ORCPT ); Wed, 17 Jun 2020 17:17:03 -0400 Received: from pb-smtp1.pobox.com (unknown [127.0.0.1]) by pb-smtp1.pobox.com (Postfix) with ESMTP id CC3977D8F2; Wed, 17 Jun 2020 17:17:00 -0400 (EDT) (envelope-from junio@pobox.com) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=pobox.com; h=from:to:cc :subject:references:date:in-reply-to:message-id:mime-version :content-type; s=sasl; bh=9S6m2v1AbLPVKRjdOS7vCS6mzKg=; b=jrgocJ IfWNQwIRZCUneXsonlTw+L6Bt/iIxrRtsJZQt6Pq/ejbI2WPTUvIhFvfnbkcrlXO INIrSTLnDyJTLUz9aFtwWicveEKbx2LRypigjEgBGLBjhvaakHMmC0AnMLexDEvr iHgQ6T1scZtXNXl5UYJyQzUucX98Xs8rE4cW0= DomainKey-Signature: a=rsa-sha1; c=nofws; d=pobox.com; h=from:to:cc :subject:references:date:in-reply-to:message-id:mime-version :content-type; q=dns; s=sasl; b=JPeeoTQ8blVvro0cVzSg1Og9JBC6Gdai Dv6e2gRKsO9c8BMhymKAIal62nmeyvcnWk9GpUi6ULa8e7HsAUZ2yczMO+fW3JKu BMQ/pXUIYZuSkHDvVJSM72RwED4UFoilb7M+eMHKjMi8diRxXe9UkAEV5nMXyP3V H2O/8zPMKeE= Received: from pb-smtp1.nyi.icgroup.com (unknown [127.0.0.1]) by pb-smtp1.pobox.com (Postfix) with ESMTP id AC01E7D8F1; Wed, 17 Jun 2020 17:17:00 -0400 (EDT) (envelope-from junio@pobox.com) Received: from pobox.com (unknown [35.196.173.25]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pb-smtp1.pobox.com (Postfix) with ESMTPSA id C90FC7D8F0; Wed, 17 Jun 2020 17:16:59 -0400 (EDT) (envelope-from junio@pobox.com) From: Junio C Hamano To: Johannes Sixt Cc: Johannes Schindelin via GitGitGadget , git@vger.kernel.org, don@goodman-wilson.com, stolee@gmail.com, peff@peff.net, sandals@crustytoothpaste.net, Matt Rogers , Eric Sunshine , Taylor Blau , Phillip Wood , Alban Gruin , Johannes Schindelin Subject: Re: [PATCH v2 02/12] fmt-merge-msg: introduce a way to override the main branch name References: <1612660e-aa49-5d7f-d47e-34740e330eaa@kdbg.org> Date: Wed, 17 Jun 2020 14:16:59 -0700 In-Reply-To: <1612660e-aa49-5d7f-d47e-34740e330eaa@kdbg.org> (Johannes Sixt's message of "Wed, 17 Jun 2020 22:56:18 +0200") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Pobox-Relay-ID: E1AA6046-B0DF-11EA-A5C6-C28CBED8090B-77302942!pb-smtp1.pobox.com Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Johannes Sixt writes: > Am 15.06.20 um 14:50 schrieb Johannes Schindelin via GitGitGadget: >> @@ -451,10 +451,12 @@ static void fmt_merge_msg_title(struct strbuf *out, >> strbuf_addf(out, " of %s", srcs.items[i].string); >> } >> >> - if (!strcmp("master", current_branch)) >> + main_branch = git_main_branch_name(); >> + if (!strcmp(main_branch, current_branch)) >> strbuf_addch(out, '\n'); >> else >> strbuf_addf(out, " into %s\n", current_branch); >> + free(main_branch); >> } > > Now that the removal of this special case is on the plate, I would > prefer that the phrase "into foo" is never appended instead of always > appended. I do not mind such an optional feature. I always find it useful whenever I read "git log --oneline --first-parent master..pu" (of course I have an alias for that) to see which topics are already in my private "to be used in real life" edition, so I would oppose to an unconditional removal, though.