| Message ID | 9d7077d1a696c226666c6230d95c0cc84f1fa58c.1717597818.git.ashish.is@lostca.se |
|---|---|
| State | New |
| Headers | show |
| Series | [bug#71381] gnu: git: Update to 2.45.2. | expand |
Hi! I'm wondering why is this bug report closed, as I don't see any commit to git derivation in the master branch atm. Could you please elaborate ? Thanks!
On Mon, Jun 24, 2024 at 04:07:52AM +0000, Ashish SHUKLA via Guix-patches via wrote: > I'm wondering why is this bug report closed, as I don't see any commit > to git derivation in the master branch atm. This patched was pushed to master as commit 26c0ff98cf4302fc69539272d646c0ef28991991 https://git.savannah.gnu.org/cgit/guix.git/commit/?id=26c0ff98cf4302fc69539272d646c0ef28991991 Now, I see that some other change was included to 'gnu/packages/linux.scm', probably by accident. I'm going to look into that now. Thanks for the contribution!
On Wed, Jun 26, 2024 at 10:25:40AM -0400, Leo Famulari wrote: > On Mon, Jun 24, 2024 at 04:07:52AM +0000, Ashish SHUKLA via Guix-patches via wrote: > > I'm wondering why is this bug report closed, as I don't see any commit > > to git derivation in the master branch atm. > > This patched was pushed to master as commit 26c0ff98cf4302fc69539272d646c0ef28991991 > > https://git.savannah.gnu.org/cgit/guix.git/commit/?id=26c0ff98cf4302fc69539272d646c0ef28991991 > > Now, I see that some other change was included to > 'gnu/packages/linux.scm', probably by accident. I'm going to look into > that now. I went ahead and reverted this change to bcc, leaving the Git update in place. Maxim, let us know if I shouldn't have done that, and the bcc change should be reinstated.
Hi Leo, Leo Famulari <leo@famulari.name> writes: > On Wed, Jun 26, 2024 at 10:25:40AM -0400, Leo Famulari wrote: >> On Mon, Jun 24, 2024 at 04:07:52AM +0000, Ashish SHUKLA via Guix-patches via wrote: >> > I'm wondering why is this bug report closed, as I don't see any commit >> > to git derivation in the master branch atm. >> >> This patched was pushed to master as commit 26c0ff98cf4302fc69539272d646c0ef28991991 >> >> https://git.savannah.gnu.org/cgit/guix.git/commit/?id=26c0ff98cf4302fc69539272d646c0ef28991991 >> >> Now, I see that some other change was included to >> 'gnu/packages/linux.scm', probably by accident. I'm going to look into >> that now. > > I went ahead and reverted this change to bcc, leaving the Git update in > place. > > Maxim, let us know if I shouldn't have done that, and the bcc change > should be reinstated. Seems I had squashed the bcc change in the wrong commit while working on a stack of patches to commit. It's still useful (as 'guix lint bcc' would say), so I've reinstated that in its own commit and the git update too: 03459ca165 master gnu: git: Update to 2.45.2. a3b8a9627b gnu: bcc: Add bash-minimal to inputs. Thanks for the heads-up.
On Wed, Jun 26, 2024, at 15:01, Maxim Cournoyer wrote: > Seems I had squashed the bcc change in the wrong commit while working on > a stack of patches to commit. It's still useful (as 'guix lint bcc' > would say), so I've reinstated that in its own commit and the git update > too: Ah, I meant to only revert the bcc changes. I am rusty!
diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 4280d4fab8..559e5679b1 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -242,14 +242,14 @@ (define git-cross-configure-flags (define-public git (package (name "git") - (version "2.45.1") + (version "2.45.2") (source (origin (method url-fetch) (uri (string-append "mirror://kernel.org/software/scm/git/git-" version ".tar.xz")) (sha256 (base32 - "1gqj5xrlmzs4amrj7xgxx7qpqj8br8f6bk4bzcnf4yk2iq538kg6")))) + "1nws1vjgj54sv32wxl1h3n1jkcpabqv7a605hhafsby0n5zfigsi")))) (build-system gnu-build-system) (native-inputs `(("native-perl" ,perl) @@ -269,7 +269,7 @@ (define-public git version ".tar.xz")) (sha256 (base32 - "1w6r2liifafsxydmc48p578z7z70ys0spm6qp5ygdd0l26mxf8p6")))) + "1pqrp46kwbxycqld39027ph1cvkq9am156y3sswn6w2khsg30f09")))) ;; For subtree documentation. ("asciidoc" ,asciidoc) ("docbook2x" ,docbook2x)
From: Ashish SHUKLA <ashish.is@lostca.se> * gnu/packages/version-control.scm (git): Update to 2.45.2. Change-Id: I6bcbc5f0f12a50cbfc0fdc51c30b26e765005d28 --- gnu/packages/version-control.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) base-commit: 425cf1fbe2fff25bda1b5eb948ce01170d23ab6a