[bug#73309] [PATCH] gnu: git: Update to 2.46.1.

[bug#73309] [PATCH] gnu: git: Update to 2.46.1.

[Ashish SHUKLA via Guix-patches via]

* 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@bayesians.ca>
 ;;; Copyright © 2024 Simon Tournier <zimon.toutoune@gmail.com>
 ;;; Copyright © 2024 Javier Olaechea <pirata@gmail.com>
+;;; Copyright © 2024 Ashish SHUKLA <ashish.is@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

[bug#73309] [PATCH] gnu: git: Update to 2.46.1.

[Greg Hogan]

On Mon, Sep 16, 2024 at 8:47 PM Ashish SHUKLA via Guix-patches via
<guix-patches@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@bayesians.ca>
>  ;;; Copyright © 2024 Simon Tournier <zimon.toutoune@gmail.com>
>  ;;; Copyright © 2024 Javier Olaechea <pirata@gmail.com>
> +;;; Copyright © 2024 Ashish SHUKLA <ashish.is@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)."

[bug#73309] [PATCH] gnu: git: Update to 2.46.2.

[Ashish SHUKLA via Guix-patches via]

* 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

[bug#73309] [PATCH] gnu: git: Update to 2.46.1.

[Ashish SHUKLA via Guix-patches via]

[-- Attachment #1: Type: text/plain, Size: 2798 bytes --]

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@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@bayesians.ca>
> >  ;;; Copyright © 2024 Simon Tournier <zimon.toutoune@gmail.com>
> >  ;;; Copyright © 2024 Javier Olaechea <pirata@gmail.com>
> > +;;; Copyright © 2024 Ashish SHUKLA <ashish.is@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

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 992 bytes --]

[bug#73309] Review of 73309

[Steve George]

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