GNU bug report logs - #73309
[PATCH v4] gnu: git: Update to 2.47.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 73309 in the body.
You can then email your comments to 73309 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: Ashish SHUKLA <ashish.is <at> lostca.se>
To: guix-patches <at> gnu.org
Cc: Ashish SHUKLA <ashish.is <at> lostca.se>
Subject: [PATCH] gnu: git: Update to 2.46.1.
Date: Tue, 17 Sep 2024 00:43:14 +0000

* gnu/packages/version-control.scm (git-minimal): Update to 2.46.1.
(git)[arguments]<install-man-pages>: Update hash.

Change-Id: I667da2d99478c073aed60ab995d86220fd860050
---
 gnu/packages/version-control.scm | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index 3bec28c4f7..c0dc623678 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -57,6 +57,7 @@
 ;;; Copyright © 2024 Suhail Singh <suhail <at> bayesians.ca>
 ;;; Copyright © 2024 Simon Tournier <zimon.toutoune <at> gmail.com>
 ;;; Copyright © 2024 Javier Olaechea <pirata <at> gmail.com>
+;;; Copyright © 2024 Ashish SHUKLA <ashish.is <at> lostca.se>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -250,14 +251,14 @@ (define git-cross-configure-flags
 (define-public git-minimal
   (package
     (name "git-minimal")
-    (version "2.46.0")
+    (version "2.46.1")
     (source (origin
              (method url-fetch)
              (uri (string-append "mirror://kernel.org/software/scm/git/git-"
                                  version ".tar.xz"))
              (sha256
               (base32
-               "15bzq9m6c033qiz5q5gw1nqw4m452vvqax30wbms6z4bl9i384kz"))))
+               "0hzmy1vhiz2w34bjdb633pw8ic0fhnl4100npjzcpd3apnwaz348"))))
     (build-system gnu-build-system)
     (arguments
      (list
@@ -702,7 +703,7 @@ (define-public git
                                ".tar.xz"))
                          (sha256
                           (base32
-                           "1lvvhzypllbyd8j6m0p9qgd3gqg10gch9s7lqif8vr9n80fqn4fw"))))))))))))
+                           "0smz24yfdpczr2p03b4d6v3fn93g19gv9z8s0v4fjdx7w2xf8liw"))))))))))))
     (native-inputs
      (modify-inputs (package-native-inputs git-minimal)
        ;; For subtree documentation.

base-commit: 8dae6b47542b906682f83b06b0478fcbd0776fd6
-- 
2.46.1

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

From: Greg Hogan <code <at> greghogan.com>
To: Ashish SHUKLA <ashish.is <at> lostca.se>
Cc: 73309 <at> debbugs.gnu.org
Subject: Re: [bug#73309] [PATCH] gnu: git: Update to 2.46.1.
Date: Tue, 1 Oct 2024 10:26:13 -0400

On Mon, Sep 16, 2024 at 8:47 PM Ashish SHUKLA via Guix-patches via
<guix-patches <at> gnu.org> wrote:
>
> * gnu/packages/version-control.scm (git-minimal): Update to 2.46.1.
> (git)[arguments]<install-man-pages>: Update hash.
>
> Change-Id: I667da2d99478c073aed60ab995d86220fd860050
> ---
>  gnu/packages/version-control.scm | 7 ++++---
>  1 file changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
> index 3bec28c4f7..c0dc623678 100644
> --- a/gnu/packages/version-control.scm
> +++ b/gnu/packages/version-control.scm
> @@ -57,6 +57,7 @@
>  ;;; Copyright © 2024 Suhail Singh <suhail <at> bayesians.ca>
>  ;;; Copyright © 2024 Simon Tournier <zimon.toutoune <at> gmail.com>
>  ;;; Copyright © 2024 Javier Olaechea <pirata <at> gmail.com>
> +;;; Copyright © 2024 Ashish SHUKLA <ashish.is <at> lostca.se>
>  ;;;
>  ;;; This file is part of GNU Guix.
>  ;;;
> @@ -250,14 +251,14 @@ (define git-cross-configure-flags
>  (define-public git-minimal
>    (package
>      (name "git-minimal")
> -    (version "2.46.0")
> +    (version "2.46.1")
>      (source (origin
>               (method url-fetch)
>               (uri (string-append "mirror://kernel.org/software/scm/git/git-"
>                                   version ".tar.xz"))
>               (sha256
>                (base32
> -               "15bzq9m6c033qiz5q5gw1nqw4m452vvqax30wbms6z4bl9i384kz"))))
> +               "0hzmy1vhiz2w34bjdb633pw8ic0fhnl4100npjzcpd3apnwaz348"))))
>      (build-system gnu-build-system)
>      (arguments
>       (list
> @@ -702,7 +703,7 @@ (define-public git
>                                 ".tar.xz"))
>                           (sha256
>                            (base32
> -                           "1lvvhzypllbyd8j6m0p9qgd3gqg10gch9s7lqif8vr9n80fqn4fw"))))))))))))
> +                           "0smz24yfdpczr2p03b4d6v3fn93g19gv9z8s0v4fjdx7w2xf8liw"))))))))))))
>      (native-inputs
>       (modify-inputs (package-native-inputs git-minimal)
>         ;; For subtree documentation.
>
> base-commit: 8dae6b47542b906682f83b06b0478fcbd0776fd6
> --
> 2.46.1

Would it be better to skip 2.46.1 given the release note for 2.46.2?
    https://raw.githubusercontent.com/git/git/master/Documentation/RelNotes/2.46.2.txt

"It also reverts the "git patch-id" change that went into 2.46.1, as
it seems to have got a regression reported (I haven't verified, but it
is better to keep a known breakage than adding an unintended
regression)."

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

From: Ashish SHUKLA <ashish.is <at> lostca.se>
To: 73309 <at> debbugs.gnu.org
Cc: Ashish SHUKLA <ashish.is <at> lostca.se>, code <at> greghogan.com
Subject: [PATCH] gnu: git: Update to 2.46.2.
Date: Wed,  2 Oct 2024 08:34:04 +0000

* gnu/packages/version-control.scm (git-minimal): Update to 2.46.2.
(git)[arguments]<install-man-pages>: Update hash.

Change-Id: I667da2d99478c073aed60ab995d86220fd860050
---
 gnu/packages/version-control.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index 87186985e9..e1e9258d81 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -254,14 +254,14 @@ (define git-cross-configure-flags
 (define-public git-minimal
   (package
     (name "git-minimal")
-    (version "2.46.0")
+    (version "2.46.2")
     (source (origin
              (method url-fetch)
              (uri (string-append "mirror://kernel.org/software/scm/git/git-"
                                  version ".tar.xz"))
              (sha256
               (base32
-               "15bzq9m6c033qiz5q5gw1nqw4m452vvqax30wbms6z4bl9i384kz"))))
+               "18rcmvximgyg3v1a9papi9djfamiak0ys5cmgx7ll29nhp3a3s2y"))))
     (build-system gnu-build-system)
     (arguments
      (list
@@ -706,7 +706,7 @@ (define-public git
                                ".tar.xz"))
                          (sha256
                           (base32
-                           "1lvvhzypllbyd8j6m0p9qgd3gqg10gch9s7lqif8vr9n80fqn4fw"))))))))))))
+                           "1bn2jifax2w0q4p67qhnb3fwsx9qvqpa0h2c857zs8mnn2cmp6gy"))))))))))))
     (native-inputs
      (modify-inputs (package-native-inputs git-minimal)
        ;; For subtree documentation.

base-commit: b9f2ff6b8d361fa40f6db08378cb47afa2652c4e
-- 
2.46.2

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

From: "Ashish SHUKLA" <ashish.is <at> lostca.se>
To: "Greg Hogan" <code <at> greghogan.com>
Cc: 73309 <at> debbugs.gnu.org
Subject: Re: [bug#73309] [PATCH] gnu: git: Update to 2.46.1.
Date: Wed, 02 Oct 2024 10:37:28 +0200

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

On Tue Oct 1, 2024 at 4:26 PM CEST, Greg Hogan wrote:
> On Mon, Sep 16, 2024 at 8:47 PM Ashish SHUKLA via Guix-patches via
> <guix-patches <at> gnu.org> wrote:
> >
> > * gnu/packages/version-control.scm (git-minimal): Update to 2.46.1.
> > (git)[arguments]<install-man-pages>: Update hash.
> >
> > Change-Id: I667da2d99478c073aed60ab995d86220fd860050
> > ---
> >  gnu/packages/version-control.scm | 7 ++++---
> >  1 file changed, 4 insertions(+), 3 deletions(-)
> >
> > diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
> > index 3bec28c4f7..c0dc623678 100644
> > --- a/gnu/packages/version-control.scm
> > +++ b/gnu/packages/version-control.scm
> > @@ -57,6 +57,7 @@
> >  ;;; Copyright © 2024 Suhail Singh <suhail <at> bayesians.ca>
> >  ;;; Copyright © 2024 Simon Tournier <zimon.toutoune <at> gmail.com>
> >  ;;; Copyright © 2024 Javier Olaechea <pirata <at> gmail.com>
> > +;;; Copyright © 2024 Ashish SHUKLA <ashish.is <at> lostca.se>
> >  ;;;
> >  ;;; This file is part of GNU Guix.
> >  ;;;
> > @@ -250,14 +251,14 @@ (define git-cross-configure-flags
> >  (define-public git-minimal
> >    (package
> >      (name "git-minimal")
> > -    (version "2.46.0")
> > +    (version "2.46.1")
> >      (source (origin
> >               (method url-fetch)
> >               (uri (string-append "mirror://kernel.org/software/scm/git/git-"
> >                                   version ".tar.xz"))
> >               (sha256
> >                (base32
> > -               "15bzq9m6c033qiz5q5gw1nqw4m452vvqax30wbms6z4bl9i384kz"))))
> > +               "0hzmy1vhiz2w34bjdb633pw8ic0fhnl4100npjzcpd3apnwaz348"))))
> >      (build-system gnu-build-system)
> >      (arguments
> >       (list
> > @@ -702,7 +703,7 @@ (define-public git
> >                                 ".tar.xz"))
> >                           (sha256
> >                            (base32
> > -                           "1lvvhzypllbyd8j6m0p9qgd3gqg10gch9s7lqif8vr9n80fqn4fw"))))))))))))
> > +                           "0smz24yfdpczr2p03b4d6v3fn93g19gv9z8s0v4fjdx7w2xf8liw"))))))))))))
> >      (native-inputs
> >       (modify-inputs (package-native-inputs git-minimal)
> >         ;; For subtree documentation.
> >
> > base-commit: 8dae6b47542b906682f83b06b0478fcbd0776fd6
> > --
> > 2.46.1
>
> Would it be better to skip 2.46.1 given the release note for 2.46.2?
>     https://raw.githubusercontent.com/git/git/master/Documentation/RelNotes/2.46.2.txt
>
> "It also reverts the "git patch-id" change that went into 2.46.1, as
> it seems to have got a regression reported (I haven't verified, but it
> is better to keep a known breakage than adding an unintended
> regression)."

Thanks for pointing about this.

I just sent an updated patch.

--
Ashish

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

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

From: Steve George <steve <at> futurile.net>
To: 73309 <at> debbugs.gnu.org
Subject: Review of 73309
Date: Wed, 2 Oct 2024 20:45:22 +0100

user guix
usertag 73309 + reviewed-looks-good
thanks

Guix QA review form submission:
- Commit is fine, built and installed
- Built about 100 of the 425 dependents
  - no new failures (over things that are already failing on Master).

Items marked as checked: Lint warnings, Package builds, Commit messages

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

From: ashish.is <at> lostca.se
To: 73309 <at> debbugs.gnu.org
Cc: Ashish SHUKLA <ashish.is <at> lostca.se>
Subject: [PATCH v3] gnu: git: Update to 2.47.0.
Date: Fri, 11 Oct 2024 16:48:53 +0200

From: Ashish SHUKLA <ashish.is <at> lostca.se>

* gnu/packages/version-control.scm (git-minimal): Update to 2.47.0.
(git)[arguments]<install-man-pages>: Update hash.

Change-Id: I63ad29cf4002606737160d5615ed0845babefe3b
---
 gnu/packages/version-control.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index 09066d2fa4..8b17f26c79 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -254,14 +254,14 @@ (define git-cross-configure-flags
 (define-public git-minimal
   (package
     (name "git-minimal")
-    (version "2.46.0")
+    (version "2.47.0")
     (source (origin
              (method url-fetch)
              (uri (string-append "mirror://kernel.org/software/scm/git/git-"
                                  version ".tar.xz"))
              (sha256
               (base32
-               "15bzq9m6c033qiz5q5gw1nqw4m452vvqax30wbms6z4bl9i384kz"))))
+               "0kmwhxysxsvsmqnm9xwyiv4gi6ck9ph52z027ss72hkhi3d19q8w"))))
     (build-system gnu-build-system)
     (arguments
      (list
@@ -706,7 +706,7 @@ (define-public git
                                ".tar.xz"))
                          (sha256
                           (base32
-                           "1lvvhzypllbyd8j6m0p9qgd3gqg10gch9s7lqif8vr9n80fqn4fw"))))))))))))
+                           "1f7sn4rf3j2339xv2ijzljxdjq9l1bl07zs8mb1fbjfxgfhfzpy8"))))))))))))
     (native-inputs
      (modify-inputs (package-native-inputs git-minimal)
        ;; For subtree documentation.

base-commit: 053accdde356eaf84751b16d3aaf1425f410a70b
-- 
2.47.0

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

From: ashish.is <at> lostca.se
To: 73309 <at> debbugs.gnu.org
Cc: Ashish SHUKLA <ashish.is <at> lostca.se>
Subject: [PATCH] gnu: git: Update to 2.47.1.
Date: Tue, 26 Nov 2024 20:33:33 +0100

From: Ashish SHUKLA <ashish.is <at> lostca.se>

* gnu/packages/version-control.scm (git-minimal): Update to 2.47.1.
(git)[arguments]<install-man-pages>: Update hash.

Change-Id: I63ad29cf4002606737160d5615ed0845babefe3b
---
 gnu/packages/version-control.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index c892a83a98..bc4ad4ac52 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -258,14 +258,14 @@ (define git-cross-configure-flags
 (define-public git-minimal
   (package
     (name "git-minimal")
-    (version "2.46.0")
+    (version "2.47.1")
     (source (origin
              (method url-fetch)
              (uri (string-append "mirror://kernel.org/software/scm/git/git-"
                                  version ".tar.xz"))
              (sha256
               (base32
-               "15bzq9m6c033qiz5q5gw1nqw4m452vvqax30wbms6z4bl9i384kz"))))
+               "046kdr5dhg31hjcg6wpfqnwwbaqdjyax7n8wx5s26fdf4fxzkn7k"))))
     (build-system gnu-build-system)
     (arguments
      (list
@@ -710,7 +710,7 @@ (define-public git
                                ".tar.xz"))
                          (sha256
                           (base32
-                           "1lvvhzypllbyd8j6m0p9qgd3gqg10gch9s7lqif8vr9n80fqn4fw"))))))))))))
+                           "04zfxwdhja82mm24isk2jxhp30q6l3nnnzv6gdrc0mmhi5d01hpz"))))))))))))
     (native-inputs
      (modify-inputs (package-native-inputs git-minimal)
        ;; For subtree documentation.

base-commit: a2a3264bb38568e892e69e64dcfd12829a9975ce
-- 
2.47.1

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

From: ashish.is <at> lostca.se
To: 73309 <at> debbugs.gnu.org
Cc: Ashish SHUKLA <ashish.is <at> lostca.se>
Subject: [PATCH v4] gnu: git: Update to 2.47.1.
Date: Tue, 26 Nov 2024 20:37:02 +0100

From: Ashish SHUKLA <ashish.is <at> lostca.se>

* gnu/packages/version-control.scm (git-minimal): Update to 2.47.1.
(git)[arguments]<install-man-pages>: Update hash.

Change-Id: I43b730ab22dbf3c8750936cb342f96342b9ca0b0
---
Hi,

Please disregard previous patch.

 gnu/packages/version-control.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index c892a83a98..bc4ad4ac52 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -258,14 +258,14 @@ (define git-cross-configure-flags
 (define-public git-minimal
   (package
     (name "git-minimal")
-    (version "2.46.0")
+    (version "2.47.1")
     (source (origin
              (method url-fetch)
              (uri (string-append "mirror://kernel.org/software/scm/git/git-"
                                  version ".tar.xz"))
              (sha256
               (base32
-               "15bzq9m6c033qiz5q5gw1nqw4m452vvqax30wbms6z4bl9i384kz"))))
+               "046kdr5dhg31hjcg6wpfqnwwbaqdjyax7n8wx5s26fdf4fxzkn7k"))))
     (build-system gnu-build-system)
     (arguments
      (list
@@ -710,7 +710,7 @@ (define-public git
                                ".tar.xz"))
                          (sha256
                           (base32
-                           "1lvvhzypllbyd8j6m0p9qgd3gqg10gch9s7lqif8vr9n80fqn4fw"))))))))))))
+                           "04zfxwdhja82mm24isk2jxhp30q6l3nnnzv6gdrc0mmhi5d01hpz"))))))))))))
     (native-inputs
      (modify-inputs (package-native-inputs git-minimal)
        ;; For subtree documentation.

base-commit: a2a3264bb38568e892e69e64dcfd12829a9975ce
-- 
2.47.1

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

From: Ludovic Courtès <ludo <at> gnu.org>
To: ashish.is <at> lostca.se
Cc: 73309-done <at> debbugs.gnu.org
Subject: Re: bug#73309: [PATCH v4] gnu: git: Update to 2.47.1.
Date: Mon, 23 Dec 2024 20:34:30 +0100

ashish.is <at> lostca.se skribis:

> From: Ashish SHUKLA <ashish.is <at> lostca.se>
>
> * gnu/packages/version-control.scm (git-minimal): Update to 2.47.1.
> (git)[arguments]<install-man-pages>: Update hash.
>
> Change-Id: I43b730ab22dbf3c8750936cb342f96342b9ca0b0

Finally applied, thanks!

Previous Next

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