GNU bug report logs - #53751
[PATCH staging] gnu: git: Update to 2.35.1.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 53751 in the body.
You can then email your comments to 53751 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Greg Hogan <code <at> greghogan.com>
To: guix-patches <at> gnu.org
Subject: [PATCH staging] gnu: git: Update to 2.35.1.
Date: Thu, 3 Feb 2022 10:31:03 -0500

[Message part 1 (text/plain, inline)]

Tested build with dependent packages with 'git' in the name:
./pre-inst-env guix refresh -l git | cut -d: -f2- | tr ' ' '\n' | grep git
| xargs ./pre-inst-env guix build

Patches are both attached and inlined below.


From 5ed6fcda2fa6aff6e6c2a3a0b771153fad2f3633 Mon Sep 17 00:00:00 2001
From: Greg Hogan <code <at> greghogan.com>
Date: Thu, 3 Feb 2022 13:25:51 +0000
Subject: [PATCH 1/2] gnu: git: Update to 2.35.1.

* gnu/packages/version-control.scm (git): Update to 2.35.1.
---
 gnu/packages/version-control.scm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/version-control.scm
b/gnu/packages/version-control.scm
index 95287c7c69..797c9437f9 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -32,7 +32,7 @@
 ;;; Copyright © 2020, 2021 Vinicius Monego <monego <at> posteo.net>
 ;;; Copyright © 2020 Tanguy Le Carrour <tanguy <at> bioneland.org>
 ;;; Copyright © 2020, 2021 Michael Rohleder <mike <at> rohleder.de>
-;;; Copyright © 2021 Greg Hogan <code <at> greghogan.com>
+;;; Copyright © 2021, 2022 Greg Hogan <code <at> greghogan.com>
 ;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
 ;;; Copyright © 2021 Chris Marusich <cmmarusich <at> gmail.com>
 ;;; Copyright © 2021 Léo Le Bouter <lle-bout <at> zaclys.net>
@@ -219,14 +219,14 @@ (define git-cross-configure-flags
 (define-public git
   (package
    (name "git")
-   (version "2.34.1")
+   (version "2.35.1")
    (source (origin
             (method url-fetch)
             (uri (string-append "mirror://kernel.org/software/scm/git/git-"
                                 version ".tar.xz"))
             (sha256
              (base32
-              "0b40vf315s1kz65x1wq47g8srl4wqac39pwnvlj1mdzs3kfma1rs"))))
+              "100h37cpw49pmlpf6lcpm1xi578gllf6y9in60h5mxj3cj754s6p"))))
    (build-system gnu-build-system)
    (native-inputs
     `(("native-perl" ,perl)
@@ -246,7 +246,7 @@ (define-public git
                 version ".tar.xz"))
           (sha256
            (base32
-            "1f3y7hxvs9p00wwwi8zdn0sgn6nh1pgg1fdsnz2bq8gzfbbmsqww"))))
+            "00rqdj2bc3i7pfc16pciiz50ww41jkqg18iy5hi5jnf0y98sgqz4"))))
       ;; For subtree documentation.
       ("asciidoc" ,asciidoc)
       ("docbook-xsl" ,docbook-xsl)
-- 
2.34.0

From 6fbb70ce36a290a1a475eaa88bc86a0024917ba6 Mon Sep 17 00:00:00 2001
From: Greg Hogan <code <at> greghogan.com>
Date: Thu, 3 Feb 2022 15:24:22 +0000
Subject: [PATCH 2/2] gnu: stgit: Update to 1.5.

* gnu/packages/version-control.scm (stgit): Update to 1.5.
---
 gnu/packages/version-control.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/version-control.scm
b/gnu/packages/version-control.scm
index 797c9437f9..e28349299b 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -1320,7 +1320,7 @@ (define-public git-flow
 (define-public stgit
   (package
     (name "stgit")
-    (version "1.1")
+    (version "1.5")
     (source
      (origin
        (method git-fetch)
@@ -1329,7 +1329,7 @@ (define-public stgit
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1jp74qsgw3f9c8xgaaqvmhfh4ar3n1ns5ncm8glvqyywlxldxi0n"))))
+        (base32 "1igljjpdgl4na1a5hi0nmg36ph0hw6hw8hhq5436fgcl8yjimyz3"))))
     (build-system python-build-system)
     (native-inputs
      (list perl))
-- 
2.34.0

[Message part 2 (text/html, inline)]

[0001-gnu-git-Update-to-2.35.1.patch (text/x-patch, attachment)]

[0002-gnu-stgit-Update-to-1.5.patch (text/x-patch, attachment)]

Message #10 received at 53751-done <at> debbugs.gnu.org (full text, mbox):

From: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
To: Greg Hogan <code <at> greghogan.com>
Cc: 53751-done <at> debbugs.gnu.org
Subject: Re: bug#53751: [PATCH staging] gnu: git: Update to 2.35.1.
Date: Mon, 04 Apr 2022 00:25:10 -0400

Hello,

Greg Hogan <code <at> greghogan.com> writes:

> Tested build with dependent packages with 'git' in the name:
> ./pre-inst-env guix refresh -l git | cut -d: -f2- | tr ' ' '\n' | grep git
> | xargs ./pre-inst-env guix build
>
> Patches are both attached and inlined below.

Thanks!  Applied as 223a3d7f7fdb6af9c4c090785cab15d38680e887 and
367048036d8337a8dd8cfbbd277086286d8b0b40 to the master branch (it was
just 37 packages shy over our packages count guideline).

Closing.

Maxim

Message #13 received at 53751 <at> debbugs.gnu.org (full text, mbox):

From: Christopher Baines <mail <at> cbaines.net>
To: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
Cc: guix-devel <at> gnu.org, 53751 <at> debbugs.gnu.org
Subject: Re: 06/07: gnu: git: Update to 2.35.1.
Date: Tue, 05 Apr 2022 10:23:38 +0100

[Message part 1 (text/plain, inline)]

guix-commits <at> gnu.org writes:

> apteryx pushed a commit to branch master
> in repository guix.
>
> commit 223a3d7f7fdb6af9c4c090785cab15d38680e887
> Author: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
> AuthorDate: Mon Apr 4 00:06:48 2022 -0400
>
>     gnu: git: Update to 2.35.1.
>
>     * gnu/packages/version-control.scm (git): Update to 2.35.1.
>     [phases]: Delete trailing #t.
>
>     Signed-off-by: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
>     Modified-by: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>

I've been looking in to this commit, since I noticed a large number of
rebuilds.

It looks connected to Greg's patch submitted in Issue #53751, but rather
than being authored by Greg, it's authored by Maxim.

Additionally, I'm guessing that the changes in Greg's patch are much
less impactful in terms of rebuilds compared to this commit, which also
removes the trailing #t from the phases, which will have affected every
variant of the git package, including variants like git-minimal/fixed,
which as the commit in the code says, is intended to rarely change.

I'm all for making changes fast, but I'm not sure the removal of #t from
the phases in thisq package definition is worth the cost of the
thousands of package rebuilds on the master branch.

[signature.asc (application/pgp-signature, inline)]

Message #16 received at 53751 <at> debbugs.gnu.org (full text, mbox):

From: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
To: Christopher Baines <mail <at> cbaines.net>
Cc: guix-devel <at> gnu.org, 53751 <at> debbugs.gnu.org
Subject: Re: 06/07: gnu: git: Update to 2.35.1.
Date: Tue, 05 Apr 2022 09:00:05 -0400

Hi Christopher,

Christopher Baines <mail <at> cbaines.net> writes:

> guix-commits <at> gnu.org writes:
>
>> apteryx pushed a commit to branch master
>> in repository guix.
>>
>> commit 223a3d7f7fdb6af9c4c090785cab15d38680e887
>> Author: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
>> AuthorDate: Mon Apr 4 00:06:48 2022 -0400
>>
>>     gnu: git: Update to 2.35.1.
>>
>>     * gnu/packages/version-control.scm (git): Update to 2.35.1.
>>     [phases]: Delete trailing #t.
>>
>>     Signed-off-by: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
>>     Modified-by: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
>
> I've been looking in to this commit, since I noticed a large number of
> rebuilds.
>
> It looks connected to Greg's patch submitted in Issue #53751, but rather
> than being authored by Greg, it's authored by Maxim.

Hm, indeed, the author field should have been Greg Hogan; not sure what
happened there (I applied it with 'git am -3' as usual); hence my
sign-off in the commit message metadata.  I'll pay more attention to
these in the future.

> Additionally, I'm guessing that the changes in Greg's patch are much
> less impactful in terms of rebuilds compared to this commit, which also
> removes the trailing #t from the phases, which will have affected every
> variant of the git package, including variants like git-minimal/fixed,
> which as the commit in the code says, is intended to rarely change.

Greg had marked it for the staging branch, but my summary verification
led me to believe only 347 packages would be impacted for (which I remember
finding a bit surprising):

--8<---------------cut here---------------start------------->8---
$ guix refresh --list-dependent git
Building the following 186 packages would ensure 347 dependent packages
are rebuilt: debops <at> 1.1.0 git-repo <at> 2.4.1 simavr <at> 1.7 libjcat <at> 0.1.9 [...]
--8<---------------cut here---------------end--------------->8---

and

--8<---------------cut here---------------start------------->8---
$ guix refresh --list-dependent git-minimal Building the following 69
packages would ensure 213 dependent packages are rebuilt:
pplacer <at> 1.1.alpha19 bap <at> 2.0.0 [...]
--8<---------------cut here---------------end--------------->8---

But I missed the git-minimal/fixed variant.  I should have tried the
'guix build libreoffice' test!

> I'm all for making changes fast, but I'm not sure the removal of #t from
> the phases in thisq package definition is worth the cost of the
> thousands of package rebuilds on the master branch.

Yeah, I don't think it's worth it.  Reverted it for now, and applied the
original version that didn't touch the trailing #t:

--8<---------------cut here---------------start------------->8---
78e8c20179 origin/master gnu: git: Update to 2.35.1.
8a9bf794e1 Revert "gnu: git: Update to 2.35.1."
--8<---------------cut here---------------end--------------->8---

Thanks for the report, and sorry for the mess :-)

Maxim

Previous Next

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