Received: (at 78437) by debbugs.gnu.org; 23 May 2025 04:36:29 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri May 23 00:36:29 2025
Received: from localhost ([127.0.0.1]:43002 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1uIK8y-0004eg-3B
for submit <at> 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 <ian@HIDDEN>) id 1uIK8s-0004eO-2T
for 78437 <at> 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: <xms:P_svaAy-xms7hmn5CakXlC7FUvKxRvZcQLdTEwJVUjJKHM-Vf5ddxw>
<xme:P_svaETPY1X4o73-e7L41jazjAKd5wpy3dCSQXED5TydIhbiEt2_3sQafx3R0KsGq
TrzW7OgQoy7nQ4kUQ>
X-ME-Received: <xmr:P_svaCWwxgnFbJZZEha0DziVcbnad0ZNV0tgKzMbrwrNyT__ZwsUt_ScOwZQ7MkXQFrNNmdrbvbvOKXaKzy61hndI4bUTPDG>
X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeffedrtddtgdejledtucdltddurdegfedvrddttd
dmucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgf
nhhsuhgsshgtrhhisggvpdfurfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttd
enucesvcftvggtihhpihgvnhhtshculddquddttddmnecujfgurhephffvvefufgffkfgg
tgfgsehtqhertddtreejnecuhfhrohhmpefkrghnucfguhhrvgcuoehirghnsehrvghtrh
hoshhpvggtrdhtvheqnecuggftrfgrthhtvghrnheptdetkeffffefiefhueekvdeiueeg
ieegffdthfelveelgfdtvdfhtdduheffuedvnecuvehluhhsthgvrhfuihiivgeptdenuc
frrghrrghmpehmrghilhhfrhhomhepihgrnhesrhgvthhrohhsphgvtgdrthhvpdhnsggp
rhgtphhtthhopedvpdhmohguvgepshhmthhpohhuthdprhgtphhtthhopeejkeegfeejse
guvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohepnhhgrhgrvhgvshesnhhgrhgr
vhgvshdrfhhr
X-ME-Proxy: <xmx:P_svaOip2WhHavzq-F7ZpXo_Ej4mj0SydjZgTOmaCmChOdHktUlkgA>
<xmx:P_svaCCMd0F5wRr9KIeT92_OcNlEy-qRWxWpXIdhZ_Woj2O2tP1sXA>
<xmx:P_svaPIFMrarNjsDT_3T8Y6qbVXQ15c48wX1Kp0QnNbMT1H60_BAdQ>
<xmx:P_svaJCFWU6Pg2IStayFBZ5uLvMfHmCOPjKCzCZky3skN2af5upUvA>
<xmx:P_svaPVLInG2KJ7DMi3Bwz7Stam_Yaqk-S9qiYvXIWgeqevVKZyG4eve>
Feedback-ID: id9014242:Fastmail
Received: by mail.messagingengine.com (Postfix) with ESMTPA; Fri,
23 May 2025 00:36:14 -0400 (EDT)
From: Ian Eure <ian@HIDDEN>
To: Nicolas Graves <ngraves@HIDDEN>
Subject: Re: [bug#78437] [PATCH] gnu: git-minimal: Fix ugly output of git
submodule -h.
User-Agent: mu4e 1.12.9; emacs 29.4
Date: Thu, 22 May 2025 21:36:13 -0700
Message-ID: <87h61cgczm.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Transfer-Encoding: quoted-printable
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 78437
Cc: 78437 <at> debbugs.gnu.org
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)
Hi Nicolas,
Nicolas Graves <ngraves@HIDDEN> writes:
> * gnu/packages/version-control.scm=20
> (git-minimal)[arguments]<phases>:
> 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
guix-patches@HIDDEN:bug#78437; Package guix-patches.
Full text available.
Received: (at submit) by debbugs.gnu.org; 15 May 2025 07:37:51 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu May 15 03:37:51 2025
Received: from localhost ([127.0.0.1]:50565 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1uFTA7-0002ox-0o
for submit <at> 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 <ngraves@HIDDEN>)
id 1uFTA3-0002oE-Rc
for submit <at> 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 <ngraves@HIDDEN>)
id 1uFT9T-0008Dg-U9
for guix-patches@HIDDEN; 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 <ngraves@HIDDEN>)
id 1uFT9Q-0005Nj-Bl
for guix-patches@HIDDEN; 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 <guix-patches@HIDDEN>; 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 <guix-patches@HIDDEN>; 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 <guix-patches@HIDDEN>; 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 <guix-patches@HIDDEN>; 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@HIDDEN
X-OVh-ClientIp: 80.215.247.166
From: Nicolas Graves <ngraves@HIDDEN>
To: guix-patches@HIDDEN
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@HIDDEN>
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@HIDDEN; 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 <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* gnu/packages/version-control.scm (git-minimal)[arguments]<phases>:
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
Nicolas Graves <ngraves@HIDDEN>:guix-patches@HIDDEN.
Full text available.guix-patches@HIDDEN:bug#78437; Package guix-patches.
Full text available.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.