From 24b5767dad70ac07c9ced74527699e1d6d6d69e8 Mon Sep 17 00:00:00 2001
From: Marius Bakke <mbakke@fastmail.com>
Date: Thu, 19 Mar 2020 07:47:30 +0100
Subject: gnu: git: Update to 2.25.2.

* gnu/packages/version-control.scm (git): Update to 2.25.2.
---
 gnu/packages/version-control.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'gnu/packages/version-control.scm')

diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index 86b1d58654..e7260c0116 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -150,14 +150,14 @@ (define-public git
    (name "git")
    ;; XXX When updating Git, check if the special 'git-source' input to cgit
    ;; needs to be updated as well.
-   (version "2.25.1")
+   (version "2.25.2")
    (source (origin
             (method url-fetch)
             (uri (string-append "mirror://kernel.org/software/scm/git/git-"
                                 version ".tar.xz"))
             (sha256
              (base32
-              "09lzwa183nblr6l8ib35g2xrjf9wm9yhk3szfvyzkwivdv69c9r2"))))
+              "08vivrv3my8nlp40pwsf7mcc5k7dwyh34hadjszx7qj8w01p34wv"))))
    (build-system gnu-build-system)
    (native-inputs
     `(("native-perl" ,perl)
@@ -170,7 +170,7 @@ (define-public git
                 version ".tar.xz"))
           (sha256
            (base32
-            "15pfm7j4wq8ryp9n9d81h8v0arl15yq9i6cigw45walnq5r6721h"))))
+            "06nlw6vaqvavkr4nia9qvanqbhaig4hbg9r5f0i9lbvw1hmykfvq"))))
       ;; For subtree documentation.
       ("asciidoc" ,asciidoc-py3)
       ("docbook-xsl" ,docbook-xsl)
-- 
cgit v1.2.3


From e7a90f28cb2a9c662fa7213b4fefb1196acbbefd Mon Sep 17 00:00:00 2001
From: Marius Bakke <mbakke@fastmail.com>
Date: Thu, 19 Mar 2020 07:58:08 +0100
Subject: gnu: git: Enable parallel tests.

* gnu/packages/version-control.scm (git)[arguments]: Remove #:parallel-testS?.
---
 gnu/packages/version-control.scm | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'gnu/packages/version-control.scm')

diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index e7260c0116..d25df4c63d 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -235,9 +235,6 @@ (define-public git
 
       #:test-target "test"
 
-      ;; Tests fail randomly when parallel: <https://bugs.gnu.org/29512>.
-      #:parallel-tests? #f
-
       ;; The explicit --with-tcltk forces the build system to hardcode the
       ;; absolute file name to 'wish'.
       #:configure-flags (list (string-append "--with-tcltk="
-- 
cgit v1.2.3