From unknown Fri Sep 19 16:07:31 2025 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 From: Nicolas Graves Date: Thu, 15 May 2025 09:21:18 +0200 Message-Id: <6f5549d0739acc350c4cd4dfaf45427e627e9fbf.1747294571.git.ngraves@ngraves.fr> MIME-Version: 1.0 Content-Type: text/plain 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-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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" -- 2.49.0 -- Best regards, Nicolas Graves From unknown Fri Sep 19 16:07:31 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#78437] [PATCH] gnu: git-minimal: Fix ugly output of git submodule -h. References: <6f5549d0739acc350c4cd4dfaf45427e627e9fbf.1747294571.git.ngraves@ngraves.fr> In-Reply-To: <6f5549d0739acc350c4cd4dfaf45427e627e9fbf.1747294571.git.ngraves@ngraves.fr> Resent-From: Ian Eure Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 23 May 2025 04:37:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 78437 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Nicolas Graves Cc: 78437@debbugs.gnu.org Received: via spool by 78437-submit@debbugs.gnu.org id=B78437.174797498917904 (code B ref 78437); Fri, 23 May 2025 04:37:02 +0000 Received: (at 78437) by debbugs.gnu.org; 23 May 2025 04:36:29 +0000 Received: from localhost ([127.0.0.1]:43002 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uIK8y-0004eg-3B for submit@debbugs.gnu.org; Fri, 23 May 2025 00:36:29 -0400 Received: from fout-b4-smtp.messagingengine.com ([202.12.124.147]:37693) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uIK8s-0004eO-2T for 78437@debbugs.gnu.org; Fri, 23 May 2025 00:36:26 -0400 Received: from phl-compute-12.internal (phl-compute-12.phl.internal [10.202.2.52]) by mailfout.stl.internal (Postfix) with ESMTP id 2058E1140099; Fri, 23 May 2025 00:36:16 -0400 (EDT) Received: from phl-mailfrontend-01 ([10.202.2.162]) by phl-compute-12.internal (MEProxy); Fri, 23 May 2025 00:36:16 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=retrospec.tv; h= cc:cc:content-transfer-encoding:content-type:content-type:date :date:from:from:in-reply-to:message-id:mime-version:reply-to :subject:subject:to:to; s=fm2; t=1747974975; x=1748061375; bh=4i 6rNEbedbVwnR6bZLai1VqokIxZ0ftREoFbI8LWGAY=; b=Hwso9XRjRfjGQ/BUST WJi4oE+Y5RJNNHoq0ZzTixaRGgGzQYfJKrP8iMP9/YwUPE4LeO5ajYOlA49P2o/Y HKETPoX8prqv9iug9RZMoIInmw284K50VmIhqWrcPAOO1+J0lH/JxBia4gU9BSbs 4T1EkSxUiSgFyhVXvI8zIdREobBy979ibB3OArisN4tkC2DdPd/o3O8BQZGFAt4V x9yRLsPTLemtKJYpkydehdi/Ajqd7uXXTkxwXRHPq12JERnCArEDBgHNh29PJacK 83+c0OJO6K8YODwJFcvTEmXlj9vpshyaAAl8AZBiOhB93VRMhbMTFYwWigFPHR1y PACg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:message-id:mime-version:reply-to:subject :subject:to:to:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm3; t=1747974975; x=1748061375; bh=4i6rNEbedbVwnR6bZLai1VqokIxZ 0ftREoFbI8LWGAY=; b=V6FrZ+oR0iZyzISnjjoI4kJyaE6K2N2aYz1C8bup3gf3 vKG2QcnDk9FGMqK0axiIwE9rgWLKv3uyDeWcrigqJy9gVYWH0fG+I3FFsArukMh+ HKiDbbnyuO7OV2JxvhfXgpFgKEIjt2WM7zIv365yzOD2HKmU3MJluft+SGh13z1Z Pb4vMHJ6rc4+RGR6KOFE4zvMBOhm7WnYFxuYPptKxlXnK4lEF1bwHwdaNIlT/zR1 tC7YSIQ9X8z9XDF+EdZ2zzCE0sBOdAHA1tqcsNovT59YxfBPY9vmeNOIyGCpjgQ5 RtETrXVtF8O1BkP0VUGaxYUllnFyd+HkvqNYdTg6ew== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeffedrtddtgdejledtucdltddurdegfedvrddttd dmucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgf nhhsuhgsshgtrhhisggvpdfurfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttd enucesvcftvggtihhpihgvnhhtshculddquddttddmnecujfgurhephffvvefufgffkfgg tgfgsehtqhertddtreejnecuhfhrohhmpefkrghnucfguhhrvgcuoehirghnsehrvghtrh hoshhpvggtrdhtvheqnecuggftrfgrthhtvghrnheptdetkeffffefiefhueekvdeiueeg ieegffdthfelveelgfdtvdfhtdduheffuedvnecuvehluhhsthgvrhfuihiivgeptdenuc frrghrrghmpehmrghilhhfrhhomhepihgrnhesrhgvthhrohhsphgvtgdrthhvpdhnsggp rhgtphhtthhopedvpdhmohguvgepshhmthhpohhuthdprhgtphhtthhopeejkeegfeejse guvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohepnhhgrhgrvhgvshesnhhgrhgr vhgvshdrfhhr X-ME-Proxy: Feedback-ID: id9014242:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Fri, 23 May 2025 00:36:14 -0400 (EDT) From: Ian Eure User-Agent: mu4e 1.12.9; emacs 29.4 Date: Thu, 22 May 2025 21:36:13 -0700 Message-ID: <87h61cgczm.fsf@retrospec.tv> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) Hi Nicolas, Nicolas Graves writes: > * gnu/packages/version-control.scm=20 > (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=20 > 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 '*' >=20=20 > ;; git-submodule sources 'git-sh-setup.sh', but=20 > not before > - ;; invoking the basename and sed=20 > commands... patch them to their > - ;; absolute location. > + ;; invoking the basename and sed commands...=20 > Using those > + ;; leads to some ugly .git submodule-real,=20 > hardcode instead. The ".real" in the output is caused by the git package (which=20 inherits from git-minimal) using `wrap-program' (which is what=20 creates the ".real" files): ;; Tell 'git-submodule' where Perl is. (wrap-program git-sm `("PATH" ":" prefix (,(dirname (search-input-file inputs "bin/perl"))))) The git-minimal package has normal output: meson!ieure:~$ guix shell --pure git-minimal -- git submodule=20 -h usage: git submodule [--quiet] [--cached] Since the problem is created by the git package, I think that=E2=80=99s=20 were the fix should go. WDYT? Adding, the git-submodule script doesn=E2=80=99t call perl directly, so=20 this must be due to it calling another git plumbing command which=20 does -- `git-filter-branch' seems a likely suspect. Though if=20 that=E2=80=99s the case, git-minimal=E2=80=99s `git-filter-branch' is broke= n. I=E2=80=99m=20 not sure what the rationale is for doing it this way, but it might=20 be worth checking if the wrapper can be eliminated altogether. Thanks, -- Ian From unknown Fri Sep 19 16:07:31 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Nicolas Graves Subject: bug#78437: closed (Re: [bug#78437] [PATCH] gnu: git-minimal: Fix ugly output of git submodule -h.) Message-ID: References: <871pr75355.fsf@guixotic.coop> <6f5549d0739acc350c4cd4dfaf45427e627e9fbf.1747294571.git.ngraves@ngraves.fr> X-Gnu-PR-Message: they-closed 78437 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 78437@debbugs.gnu.org Date: Wed, 25 Jun 2025 14:05:07 +0000 Content-Type: multipart/mixed; boundary="----------=_1750860307-7249-1" This is a multi-part message in MIME format... ------------=_1750860307-7249-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #78437: [PATCH] gnu: git-minimal: Fix ugly output of git submodule -h. which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 78437@debbugs.gnu.org. --=20 78437: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D78437 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1750860307-7249-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 78437-done) by debbugs.gnu.org; 25 Jun 2025 14:04:43 +0000 Received: from localhost ([127.0.0.1]:35734 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uUQjv-0001ro-0Y for submit@debbugs.gnu.org; Wed, 25 Jun 2025 10:04:43 -0400 Received: from mailtransmit04.runbox.com ([2a0c:5a00:149::25]:51424) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uUQjo-0001qm-Ba for 78437-done@debbugs.gnu.org; Wed, 25 Jun 2025 10:04:35 -0400 Received: from mailtransmit03.runbox ([10.9.9.163] helo=aibo.runbox.com) by mailtransmit04.runbox.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1uUQje-00E0iA-OB; Wed, 25 Jun 2025 16:04:22 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=guixotic.coop; s=selector1; h=Content-Transfer-Encoding:Content-Type: MIME-Version:Message-ID:Date:References:In-Reply-To:Subject:Cc:To:From; bh=c27tUpD12l6mEls3pZUOdq81ecW8AOZjvyE+Ub5yGZo=; b=VoXV/O3xePx69FY9CgktHhEn09 ow6ethY3nNVJUMYGZ46d4/3qeL9wEWjhaQ9lcEvdCbF1cB53USqIH/jPUU9ds1hwUrtwIM7sHKsdo ws4pciwjfrEBIfH70Wy70KvMOHB3KMbhRQMwXRJsx50f0FK10Hcsmt6Jc1YPG62lDTAniP8XWYVoB Y/ZL7Qt+1BhaINF5oLTQ5cm1y63qCCmCywVUYM+gsMr1Q004DRJBT4qkC/HMtzWH6i8loSFYkuO9T eJuDuXJpFMPkwiL/4x9WylzFsuNfH/RFjZSUTVabDHmtHlQ9Iy6lMjq5+fYsiRLCmR2POqqBnPyef gPCm9eTQ==; Received: from [10.9.9.72] (helo=submission01.runbox) by mailtransmit03.runbox with esmtp (Exim 4.86_2) (envelope-from ) id 1uUQjd-0000mY-Q6; Wed, 25 Jun 2025 16:04:21 +0200 Received: by submission01.runbox with esmtpsa [Authenticated ID (1476852)] (TLS1.2:ECDHE_SECP256R1__RSA_SHA256__AES_256_GCM:256) (Exim 4.93) id 1uUQjT-002uoe-RY; Wed, 25 Jun 2025 16:04:12 +0200 From: Maxim Cournoyer To: Ian Eure Subject: Re: [bug#78437] [PATCH] gnu: git-minimal: Fix ugly output of git submodule -h. In-Reply-To: <87h61cgczm.fsf@retrospec.tv> (Ian Eure's message of "Thu, 22 May 2025 21:36:13 -0700") Organization: Guixotic References: <6f5549d0739acc350c4cd4dfaf45427e627e9fbf.1747294571.git.ngraves@ngraves.fr> <87h61cgczm.fsf@retrospec.tv> Date: Wed, 25 Jun 2025 23:04:06 +0900 Message-ID: <871pr75355.fsf@guixotic.coop> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 78437-done Cc: Nicolas Graves , 78437-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) Hi, Ian Eure writes: > Hi Nicolas, > > Nicolas Graves writes: > >> * 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. > > The ".real" in the output is caused by the git package (which inherits > from git-minimal) using `wrap-program' (which is what creates the > ".real" files): > > ;; Tell 'git-submodule' where Perl is. > (wrap-program git-sm > `("PATH" ":" prefix > (,(dirname (search-input-file inputs "bin/perl"))))) > > The git-minimal package has normal output: > > meson!ieure:~$ guix shell --pure git-minimal -- git submodule > -h > usage: git submodule [--quiet] [--cached] > > Since the problem is created by the git package, I think that=E2=80=99s w= ere > the fix should go. WDYT? > > Adding, the git-submodule script doesn=E2=80=99t call perl directly, so t= his > must be due to it calling another git plumbing command which does -- > `git-filter-branch' seems a likely suspect. Though if that=E2=80=99s the > case, git-minimal=E2=80=99s `git-filter-branch' is broken. I=E2=80=99m n= ot sure what > the rationale is for doing it this way, but it might be worth checking > if the wrapper can be eliminated altogether. I investigated a bit, and git submodules seems to work fine without this 2014 perl wrapping thing, even in a container. So, I've pushed 45ec6e0e0a gnu: git: Remove extraneous git-submodule wrapper. which should fix that, along a git update and related commits. --=20 Thanks, Maxim ------------=_1750860307-7249-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit 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 From: Nicolas Graves To: guix-patches@gnu.org Subject: [PATCH] gnu: git-minimal: Fix ugly output of git submodule -h. Date: Thu, 15 May 2025 09:21:18 +0200 Message-Id: <6f5549d0739acc350c4cd4dfaf45427e627e9fbf.1747294571.git.ngraves@ngraves.fr> MIME-Version: 1.0 Content-Type: text/plain 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-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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" -- 2.49.0 -- Best regards, Nicolas Graves ------------=_1750860307-7249-1--