From patchwork Thu May 15 07:21:18 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 42621 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 295A127BC4B; Thu, 15 May 2025 08:38:24 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 4014427BC49 for ; Thu, 15 May 2025 08:38:23 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uFTAN-0000f3-J9; Thu, 15 May 2025 03:38:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uFTAK-0000XY-Gm for guix-patches@gnu.org; Thu, 15 May 2025 03:38:05 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uFTAI-0005Rb-J5 for guix-patches@gnu.org; Thu, 15 May 2025 03:38:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:Subject; bh=v4mbPdgwUHt+ZB/MT0Ame5ob7HN5BE+Eu94NcPNv174=; b=UldL/Va9li/o3bIsba9XoO7Xd3F+ShBkh+Kf27IfkJgKu3R3tb3/CWXkAFE0FCXOKPypZc4i5EPtRTP5tQVdwHdiwQJZ8jNAZc3kFR0ChTjY6tbt/TV7/aRbsSVokYSMF2Npp2DuNh4iMcYRStQ6ZdaXzzZdU4Qk+wplDylVQJIABZvxrlDPdvzVb5+rw+dx4+ZOD5s5Xbj3LkQcaq8I5kpDpY5deT4WpxbolTJhReuiOceUSIcuR8nZQwJ0YFZH5CzcUOXQyy9IiqSBOf3W5uGMBH+TbdTpEdNpKteZdyiJulQhzJ7L7RNKUkYNnXp4wZRCRkHsNh/aXoWCADOdIQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uFTAI-0002pc-7X for guix-patches@gnu.org; Thu, 15 May 2025 03:38:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78437] [PATCH] gnu: git-minimal: Fix ugly output of git submodule -h. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 15 May 2025 07:38:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 78437 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78437@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.174729467110852 (code B ref -1); Thu, 15 May 2025 07:38:02 +0000 Received: (at submit) by debbugs.gnu.org; 15 May 2025 07:37:51 +0000 Received: from localhost ([127.0.0.1]:50565 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uFTA7-0002ox-0o for submit@debbugs.gnu.org; Thu, 15 May 2025 03:37:51 -0400 Received: from lists.gnu.org ([2001:470:142::17]:49040) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uFTA3-0002oE-Rc for submit@debbugs.gnu.org; Thu, 15 May 2025 03:37:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uFT9T-0008Dg-U9 for guix-patches@gnu.org; Thu, 15 May 2025 03:37:12 -0400 Received: from 4.mo563.mail-out.ovh.net ([46.105.53.192]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uFT9Q-0005Nj-Bl for guix-patches@gnu.org; Thu, 15 May 2025 03:37:11 -0400 Received: from director3.derp.mail-out.ovh.net (director3.derp.mail-out.ovh.net [152.228.215.222]) by mo563.mail-out.ovh.net (Postfix) with ESMTPS id 4ZyhqY45DXz1Nth for ; Thu, 15 May 2025 07:36:57 +0000 (UTC) Received: from director3.derp.mail-out.ovh.net (director3.derp.mail-out.ovh.net. [127.0.0.1]) by director3.derp.mail-out.ovh.net (inspect_sender_mail_agent) with SMTP for ; Thu, 15 May 2025 07:36:57 +0000 (UTC) Received: from mta2.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.110.178.179]) by director3.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4ZyhqY1Gfcz5xLn for ; Thu, 15 May 2025 07:36:57 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.1]) by mta2.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id E3923BA3FF5 for ; Thu, 15 May 2025 07:36:56 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-101G0040f6fa127-1b0a-4c61-8e08-2a86f6750ffd, C6E4D814B319C0DF46C715AA7A6B887CFE76273C) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 80.215.247.166 Date: Thu, 15 May 2025 09:21:18 +0200 Message-Id: <6f5549d0739acc350c4cd4dfaf45427e627e9fbf.1747294571.git.ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 11067877562673783546 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgdeftdelvdelucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvffufffkgggtsehttdertddttddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepueejleeileejfffhleetjedtleejheevudffleevgfdufeekhefgvddvveegveefnecukfhppeduvdejrddtrddtrddupdektddrvdduhedrvdegjedrudeiieenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedupdhrtghpthhtohepghhuihigqdhprghttghhvghssehgnhhurdhorhhgpdfovfetjfhoshhtpehmohehieefmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=v4mbPdgwUHt+ZB/MT0Ame5ob7HN5BE+Eu94NcPNv174=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1747294617; v=1; b=DPz/98drqVztvlAqSGBaHyqNIAcXS1Hn8sl3kSQKmIY8EBzvo5rKJv3cEIz790hVtgEYpXQx mRf9QKh2oczK7XMfUq8oOv/6hJzL2i6egMUl/gW7YbeD5BIgHcRfEL+Lj/6QFT3aJhoxgYNrAn+ Qn/4HPmnsNuRoTLotCUDb51qfEVWD+lZycKfsxV/KxfF5k0YhI+dsbtMS7fQJjBVuVBok+oHGKZ a02bfl+5nYLbf+pSXXzA8cRNce4E2sGAz7BkOLfb1gCm9g2NUf0jKrj8BRU6N3qXWCMvd07U0ZA dxQATjsG57LLBPlDUUK07MdV8FsykT7g4G9jg3xUUTMMw== Received-SPF: permerror client-ip=46.105.53.192; envelope-from=ngraves@ngraves.fr; helo=4.mo563.mail-out.ovh.net X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, T_SPF_PERMERROR=0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches X-Patchwork-Original-From: Nicolas Graves via Guix-patches via From: Nicolas Graves Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/version-control.scm (git-minimal)[arguments]: Adjust the snippet patching git-submodule.sh to avoid the ugly ".git submodule-real" from git submodule -h. --- gnu/packages/version-control.scm | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index ed96b524f83..f4bae91906d 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -437,13 +437,11 @@ (define PATH-variable-definition "GNU"))) ;matched against '*' ;; git-submodule sources 'git-sh-setup.sh', but not before - ;; invoking the basename and sed commands... patch them to their - ;; absolute location. + ;; invoking the basename and sed commands... Using those + ;; leads to some ugly .git submodule-real, hardcode instead. (substitute* "git-submodule.sh" - (("\\$\\(basename") - (string-append "$(" (search-input-file inputs "bin/basename"))) - (("sed -e") - (string-append (search-input-file inputs "bin/sed") " -e"))))) + (("^dashless=.*") + "dashless=\"git submodule\"\n")))) (add-after 'configure 'patch-makefiles (lambda _ (substitute* "Makefile"