From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-3.7 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, 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.6 Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org [IPv6:2604:1380:40f1:3f00::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by dcvr.yhbt.net (Postfix) with ESMTPS id ACCE61F406 for ; Thu, 2 Nov 2023 09:29:48 +0000 (UTC) Authentication-Results: dcvr.yhbt.net; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=CKFnpHa1; dkim-atps=neutral Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sy.mirrors.kernel.org (Postfix) with ESMTPS id F0AF3B212BE for ; Thu, 2 Nov 2023 09:29:46 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id EA58211CA5; Thu, 2 Nov 2023 09:29:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="CKFnpHa1" Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net [23.128.96.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B46B611713 for ; Thu, 2 Nov 2023 09:29:35 +0000 (UTC) Received: from mail-pj1-x102a.google.com (mail-pj1-x102a.google.com [IPv6:2607:f8b0:4864:20::102a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 69651133 for ; Thu, 2 Nov 2023 02:29:34 -0700 (PDT) Received: by mail-pj1-x102a.google.com with SMTP id 98e67ed59e1d1-28028f92709so613798a91.0 for ; Thu, 02 Nov 2023 02:29:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1698917374; x=1699522174; darn=vger.kernel.org; h=content-transfer-encoding:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=sA/E2i+Ma/zs7hTGUQgxU+16cmFggthc6jA3MYA8DS8=; b=CKFnpHa1NxkGnot3wJLGs5THGUQ81EEsbKmyRDnr+H5RQ29JX3rCj0fBsf/bTud2a7 Io9BwQtcfFgQjES1eF8696VSNRDqDjY8iroHU33UAuPdxDsTMOQIwhQK1Pxn/acKHgnm UiE4TGy0xMrlyTjqPN7Mnw64xbgkNaXePRn8Q7g7/ptCmMPwAJMGM+IxIo5jve3b2j9b nt7U88VrfJYJma+hmlle5MlXZqr6Oat5TU1pqnezdDtlYH/F9EMtyA0GTpbLP/31Y3MS 8aBhu+N7Ys6ghpyB4fLcwYNCi5S/r0t8oT4WduXIaIcWWwNuKsCYotg0WaP6X9GHBF3u T9mA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698917374; x=1699522174; h=content-transfer-encoding:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=sA/E2i+Ma/zs7hTGUQgxU+16cmFggthc6jA3MYA8DS8=; b=Llt+9z8JcDH4CX6zR9hqg2ZDoZbbtQNd5zJ66Ad3N6/gPJjPnpV14IPOfQk6FuW/Je Wxq4NkNKc4Hc58n93dw6knPaie+JMlNlzRBp3d9ucyqM2i6WMTIuYI8ptFRVOd1WpKNx Hn02E655CDdO/MfX4MTuJxm4BZLggsDEEG0vyW0DhBy/iLpac7V0Nwv7hcuQkE+p8btI 9dr6FeMILwLeByaF3th6XO//zAyx8Fy3axVAMZjBCh8g7WXMj9+EqG/xbnbrq3P8grKo cngvlwczOT04XkmiZb5sTGvMNGqsGPWFsCLWPUPwP7FGTlo3oxClj8SN1HufN15y1v4R uv3g== X-Gm-Message-State: AOJu0YymyvqP3ernRJr4cAHFc2Xv6E4rFYudTXGF5BvC55KVbpv672VO G/DEBtle9anmj+3/mq15emgvRQeOPkPfiJKE0hk= X-Google-Smtp-Source: AGHT+IEhCgsPOu13+myWYcaM+8LzvXmE+39+IKRj21JtMd7IJ17jk4NcSdZtchzYk5pQ+F0u+womtI9W/8BV+yV8uV8= X-Received: by 2002:a17:90b:1d8e:b0:280:4af4:1a41 with SMTP id pf14-20020a17090b1d8e00b002804af41a41mr7570444pjb.15.1698917373894; Thu, 02 Nov 2023 02:29:33 -0700 (PDT) Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: , MIME-Version: 1.0 References: <20231024195655.2413191-1-sandals@crustytoothpaste.net> <20231101192419.794162-1-sandals@crustytoothpaste.net> <20231101192419.794162-2-sandals@crustytoothpaste.net> In-Reply-To: From: =?UTF-8?Q?Martin_=C3=85gren?= Date: Thu, 2 Nov 2023 10:29:22 +0100 Message-ID: Subject: Re: [PATCH v3 1/2] git-merge-file doc: drop "-file" from argument placeholders To: "brian m. carlson" , =?UTF-8?Q?Martin_=C3=85gren?= , Junio C Hamano , git@vger.kernel.org, Elijah Newren , Phillip Wood , Eric Sunshine , Taylor Blau Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable List-Unsubscribe-Post: List-Unsubscribe=One-Click On Thu, 2 Nov 2023 at 10:18, brian m. carlson wrote: > > On 2023-11-02 at 08:53:36, Martin =C3=85gren wrote: > > Hmm, yeah. Or just "three non-filename arguments". I do wonder: doesn't > > this mean that the second patch could/should possibly move away from th= e > > notion of "object ID"/`--object-id`? (That's not trying to shift any > > blame from one patch to the other, that's my honest reaction.) > > Not specifying an option would make this ambiguous. What if I have a > file named "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391"? Is that the > empty blob, or is it that file? Normally we have ways to disambiguate > this, but those don't work here because of the positional arguments. I didn't intend to suggest dropping the new option altogether, sorry for being unclear. I meant moving from `--object-id` to something else, such as `--blob` that you mention. Completely agreed that something explicit is needed here and that heuristics aren't possible. > I think the name is fine. We don't typically use the phrase "blob ID" > anywhere, but we do say "object ID". We'd need to say "--blob", but > I'm not sure that's an improvement, and I fear it may be less > understandable. Agreed. Thanks. Martin