From patchwork Thu Apr 29 12:55:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Patrick Steinhardt X-Patchwork-Id: 12231263 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4C579C433B4 for ; Thu, 29 Apr 2021 12:53:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 165F8613FF for ; Thu, 29 Apr 2021 12:53:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237263AbhD2Myi (ORCPT ); Thu, 29 Apr 2021 08:54:38 -0400 Received: from wout5-smtp.messagingengine.com ([64.147.123.21]:37553 "EHLO wout5-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237228AbhD2Myg (ORCPT ); Thu, 29 Apr 2021 08:54:36 -0400 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.west.internal (Postfix) with ESMTP id C16671648; Thu, 29 Apr 2021 08:53:47 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute3.internal (MEProxy); Thu, 29 Apr 2021 08:53:48 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pks.im; h=date :from:to:cc:subject:message-id:references:mime-version :content-type:in-reply-to; s=fm3; bh=f8o3CMju8jFEwXg87Nf5BQH3yB/ L/FHcmPFpkr1vDtU=; b=CH+yY9vtqH2Pzj4yztMw5oTlGLYmFzB+eLJXjU/q7uf bea5uvj7k9swNAA2GcM8Q6DV6pCsZpp6QCnShjomVcPSB/rKeC/z0EcwCriueFf7 Aw/JVVEVAZwMvKaL4ui5drZ1KqyD8/hQjt7IPocKJtxn0N3UQtfWY1Z+1yv/h1tp jufJSFdFYDyfaXuxjfGqIUfQVBE8RKLaXVEhYxdhyDGpYZvwZ4rietIHUHnVVKYl Mkb1q0L74E4ESbbR/QZ2eQgvx4lcUVeyfK0MrU0OOEnLog6g+l44ZVFvveDqNGzD taq3DLqGA1um5MrOTtactBouU1OZ9mcSEMMUM8IHWVQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=f8o3CM ju8jFEwXg87Nf5BQH3yB/L/FHcmPFpkr1vDtU=; b=Kdc2mQZexyRD2o0o+mOUl7 fELe2MkLanhTXysITv/vf5nGOBUaJ2LSSmrOYDI9QMhdZKRZu2u/U8EUbcFjqs1P hoPHqkCoTQCExVAAcjiY6OV4wEDJCw+Eu+/wZdmaI00AOmNGHpn+DpHQVpygzGBn Rxutfpxt8XZfePf/z7r3FQS9Sqddt/e5VaYxEzv+lQTLaxjLzvoFOmFrKXY9GMv8 r0zuDcoLOIYL1DAbkyg1Kz8Wde42c0drE+LKIxCECsNLJ79w8CvA1KRar9K5+OHi GaE0uS7mr4t5p3nd8gtlQrggG5kIz/zkRqzZfOCT4vveMIEk++//oAnBCnEVssEQ == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduledrvddvgedgheelucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpeffhffvuffkfhggtggujgesghdtre ertddtudenucfhrhhomheprfgrthhrihgtkhcuufhtvghinhhhrghrughtuceophhssehp khhsrdhimheqnecuggftrfgrthhtvghrnheptdffjeeiudduleehvdfgteeifeelheejte dvteduiedttedvtdffffefhfdvgffgnecukfhppeejkedrheehrdefgedrkeejnecuvehl uhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepphhssehpkhhsrd himh X-ME-Proxy: Received: from vm-mail.pks.im (dynamic-078-055-034-087.78.55.pool.telefonica.de [78.55.34.87]) by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 29 Apr 2021 08:53:46 -0400 (EDT) Received: from localhost (tanuki [10.192.0.23]) by vm-mail.pks.im (OpenSMTPD) with ESMTPSA id f6aa43c3 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Thu, 29 Apr 2021 12:53:40 +0000 (UTC) Date: Thu, 29 Apr 2021 14:55:25 +0200 From: Patrick Steinhardt To: git@vger.kernel.org Cc: =?iso-8859-1?q?=C6var_Arnfj=F6r=F0?= Bjarmason , Jeff King Subject: [PATCH v2 0/2] git: support separate arg for `--config-env`'s value Message-ID: References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Hi, this is the second version of this series fixing inconsistencies with the `--config-env` parameter. It's only got a single change compared to v1, which is to replace `test_i18ngrep` with `grep` as pointed out by Ævar. Patrick Patrick Steinhardt (2): git.txt: fix synopsis of `--config-env` missing the equals sign git: support separate arg for `--config-env`'s value Documentation/git.txt | 2 +- git.c | 8 ++++++++ t/t1300-config.sh | 15 ++++++++++++++- 3 files changed, 23 insertions(+), 2 deletions(-) Range-diff against v1: 1: 08049f3b10 = 1: 08049f3b10 git.txt: fix synopsis of `--config-env` missing the equals sign 2: d52db89bc2 ! 2: 5264fb6fa7 git: support separate arg for `--config-env`'s value @@ t/t1300-config.sh: test_expect_success 'git --config-env=key=envvar support' ' +test_expect_success 'git --config-env with missing value' ' + test_must_fail env ENVVAR=value git --config-env 2>error && -+ test_i18ngrep "no config key given for --config-env" error && ++ grep "no config key given for --config-env" error && + test_must_fail env ENVVAR=value git --config-env config core.name 2>error && -+ test_i18ngrep "invalid config format: config" error ++ grep "invalid config format: config" error +' + test_expect_success 'git --config-env fails with invalid parameters' '