GNU logs - #78437, boring messages

Message sent to guix-patches@HIDDEN:

Subject: [bug#78437] [PATCH] gnu: git-minimal: Fix ugly output of git submodule -h.
Resent-From: Nicolas Graves <ngraves@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Thu, 15 May 2025 07:38:02 +0000
Resent-Message-ID: <handler.78437.B.174729467110852 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
To: 78437 <at> debbugs.gnu.org
From: Nicolas Graves <ngraves@HIDDEN>
Date: Thu, 15 May 2025 09:21:18 +0200
Message-Id: <6f5549d0739acc350c4cd4dfaf45427e627e9fbf.1747294571.git.ngraves@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain
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-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

Message sent:

Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-Mailer: MIME-tools 5.505 (Entity 5.505)
Content-Type: text/plain; charset=utf-8
X-Loop: help-debbugs@HIDDEN
From: help-debbugs@HIDDEN (GNU bug Tracking System)
To: Nicolas Graves <ngraves@HIDDEN>
Subject: bug#78437: Acknowledgement ([PATCH] gnu: git-minimal: Fix ugly
 output of git submodule -h.)
Message-ID: <handler.78437.B.174729467110852.ack <at> debbugs.gnu.org>
References: <6f5549d0739acc350c4cd4dfaf45427e627e9fbf.1747294571.git.ngraves@HIDDEN>
X-Gnu-PR-Message: ack 78437
X-Gnu-PR-Package: guix-patches
X-Gnu-PR-Keywords: patch
Reply-To: 78437 <at> debbugs.gnu.org
Date: Thu, 15 May 2025 07:38:02 +0000

Thank you for filing a new bug report with debbugs.gnu.org.

This is an automatically generated reply to let you know your message
has been received.

Your message is being forwarded to the package maintainers and other
interested parties for their attention; they will reply in due course.

Your message has been sent to the package maintainer(s):
 guix-patches@HIDDEN

If you wish to submit further information on this problem, please
send it to 78437 <at> debbugs.gnu.org.

Please do not send mail to help-debbugs@HIDDEN unless you wish
to report a problem with the Bug-tracking system.

--=20
78437: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D78437
GNU Bug Tracking System
Contact help-debbugs@HIDDEN with problems

Message sent to guix-patches@HIDDEN:

Subject: [bug#78437] [PATCH] gnu: git-minimal: Fix ugly output of git submodule -h.
References: <6f5549d0739acc350c4cd4dfaf45427e627e9fbf.1747294571.git.ngraves@HIDDEN>
In-Reply-To: <6f5549d0739acc350c4cd4dfaf45427e627e9fbf.1747294571.git.ngraves@HIDDEN>
Resent-From: Ian Eure <ian@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Fri, 23 May 2025 04:37:02 +0000
Resent-Message-ID: <handler.78437.B78437.174797498917904 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
To: Nicolas Graves <ngraves@HIDDEN>
Cc: 78437 <at> debbugs.gnu.org
Feedback-ID: id9014242:Fastmail
From: Ian Eure <ian@HIDDEN>
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
Precedence: list
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>

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

Last modified: Fri, 23 May 2025 04:45:02 UTC

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997 nCipher Corporation Ltd, 1994-97 Ian Jackson.