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, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI, 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 968F71F54E for ; Sun, 11 Sep 2022 05:08:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229771AbiIKFI2 (ORCPT ); Sun, 11 Sep 2022 01:08:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47878 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229589AbiIKFI0 (ORCPT ); Sun, 11 Sep 2022 01:08:26 -0400 Received: from cloud.peff.net (cloud.peff.net [104.130.231.41]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 827D2356F7 for ; Sat, 10 Sep 2022 22:08:25 -0700 (PDT) Received: (qmail 18286 invoked by uid 109); 11 Sep 2022 05:08:25 -0000 Received: from Unknown (HELO peff.net) (10.0.1.2) by cloud.peff.net (qpsmtpd/0.94) with ESMTP; Sun, 11 Sep 2022 05:08:25 +0000 Authentication-Results: cloud.peff.net; auth=none Received: (qmail 31623 invoked by uid 111); 11 Sep 2022 05:08:26 -0000 Received: from coredump.intra.peff.net (HELO sigill.intra.peff.net) (10.0.0.2) by peff.net (qpsmtpd/0.94) with (TLS_AES_256_GCM_SHA384 encrypted) ESMTPS; Sun, 11 Sep 2022 01:08:26 -0400 Authentication-Results: peff.net; auth=none Date: Sun, 11 Sep 2022 01:08:24 -0400 From: Jeff King To: Junio C Hamano Cc: Lana Deere , Johannes Schindelin , =?utf-8?B?xJBvw6BuIFRy4bqnbiBDw7RuZw==?= Danh , git@vger.kernel.org Subject: Re: [PATCH 2/2] fetch: add branch.*.merge to default ref-prefix extension Message-ID: References: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org On Thu, Sep 08, 2022 at 10:23:43PM -0700, Junio C Hamano wrote: > Giving extra garbage to the set of prefixes does not hurt the > correctness, but we didn't add the extra prefix for > branch..merge before this fix, so not using > expand_ref_prefix() is not breaking anybody who weren't broken > before. So I think it may be OK to support only the full refs at > first. It's just that folks who didn't have full refname as the > value is not helped by our fix. Right. My patch is a strict improvement. I just wasn't sure if we should go further while we are here. > If enough folks complain that they have handcrafted (or prepared by > third-party tools) branch..merge that is not a full refname, > we could switch to expand_ref_prefix() and as long as the refnames > on the remote side is not ambiguous, things will still work > correctly, but I'd prefer to keep it tight until we actually hear > complaints. OK, that matches my feeling, too. So I think the series as-is should be fine. -Peff