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=-3.9 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE shortcircuit=no autolearn=ham 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 D72E41F4D7 for ; Mon, 6 Jun 2022 17:58:03 +0000 (UTC) Authentication-Results: dcvr.yhbt.net; dkim=pass (1024-bit key; unprotected) header.d=pobox.com header.i=@pobox.com header.b="c+YXhMMG"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230368AbiFFR5q (ORCPT ); Mon, 6 Jun 2022 13:57:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47646 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230381AbiFFR5j (ORCPT ); Mon, 6 Jun 2022 13:57:39 -0400 Received: from pb-smtp2.pobox.com (pb-smtp2.pobox.com [64.147.108.71]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DD5D020BDB for ; Mon, 6 Jun 2022 10:57:35 -0700 (PDT) Received: from pb-smtp2.pobox.com (unknown [127.0.0.1]) by pb-smtp2.pobox.com (Postfix) with ESMTP id 3CF6511AE6B; Mon, 6 Jun 2022 13:57:35 -0400 (EDT) (envelope-from junio@pobox.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=pobox.com; h=from:to:cc :subject:references:date:in-reply-to:message-id:mime-version :content-type; s=sasl; bh=hsFdfrt4RZYT9GwRwSyddcZhpF7ymePMijZGkP ZVsVo=; b=c+YXhMMGFjhQJ/4Ry7/J3AcH/9eu3Q04kSAv2OIt9fhk1PkCt7xAFC EGd5GDSCowO8b1W1EGeJlKr+epYLuGDGaPJaC4fR60XWhW5SxrKcRfA2sFB4hY2A jb81bNDqFRMKg9/d4RPWmYgR5W58sf4/CtTAkvIGjZEpSOgGhIYUQ= Received: from pb-smtp2.nyi.icgroup.com (unknown [127.0.0.1]) by pb-smtp2.pobox.com (Postfix) with ESMTP id 34F3E11AE6A; Mon, 6 Jun 2022 13:57:35 -0400 (EDT) (envelope-from junio@pobox.com) Received: from pobox.com (unknown [34.83.92.57]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pb-smtp2.pobox.com (Postfix) with ESMTPSA id 99D3611AE68; Mon, 6 Jun 2022 13:57:34 -0400 (EDT) (envelope-from junio@pobox.com) From: Junio C Hamano To: "Philip Oakley via GitGitGadget" Cc: git@vger.kernel.org, =?utf-8?B?w4Z2YXIgQXJuZmrDtnLDsA==?= Bjarmason , Philip Oakley , =?utf-8?Q?Ren=C3=A9?= Scharfe Subject: Re: [PATCH v2 3/4] rebase: note `preserve` merges may be a pull config option References: Date: Mon, 06 Jun 2022 10:57:33 -0700 In-Reply-To: (Philip Oakley via GitGitGadget's message of "Sat, 04 Jun 2022 11:17:48 +0000") 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: 24DC5CFC-E5C2-11EC-993F-CB998F0A682E-77302942!pb-smtp2.pobox.com Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org "Philip Oakley via GitGitGadget" writes: > From: Philip Oakley > > The `--preserve-merges` option was removed by v2.34.0. However > users may not be aware that it is also a Pull configuration option, > which is still offered by major IDE vendors such as Visual Studio. > > Extend the `--preserve-merges` die message to also direct users to > the possible use of the `preserve` option in the `pull.rebase` config. > This is an additional 'belt and braces' information statement. > > Signed-off-by: Philip Oakley > --- > builtin/rebase.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/builtin/rebase.c b/builtin/rebase.c > index 17cc776b4b1..5f8921551e1 100644 > --- a/builtin/rebase.c > +++ b/builtin/rebase.c > @@ -1205,7 +1205,9 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) > builtin_rebase_usage, 0); > > if (preserve_merges_selected) > - die(_("--preserve-merges was replaced by --rebase-merges")); > + die(_("--preserve-merges was replaced by --rebase-merges\n" > + "Note: Your `pull.rebase` configuration may also be set to 'preserve',\n" > + "which is no longer supported; use 'merges' instead")); "be set" -> "be set". I am not sure how this helps anybody, though. When pull.rebase is parsed, rebase.c::rebase_parse_value() is called from builtin/pull.c::parse_config_rebase() and would trigger an error, whether it comes from the pull.rebase or the branch.*.rebase configuration variable. An error() message already said that 'preserve' was removed and 'merges' would be a replacement when it happened. If the user has *not* reached this die() due to a configuration variable, then there is not much point giving this new message, either.