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

From: "Ashish SHUKLA" <[email-masked]>
Date: Wed, 02 Oct 2024 10:37:28 +0200

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
> <[email-masked]> 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 <[email-masked]>
> >  ;;; Copyright © 2024 Simon Tournier <[email-masked]>
> >  ;;; Copyright © 2024 Javier Olaechea <[email-masked]>
> > +;;; Copyright © 2024 Ashish SHUKLA <[email-masked]>
> >  ;;;
> >  ;;; 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