06/07: gnu: git: Update to 2.35.1.

[guix-commits]

apteryx pushed a commit to branch master
in repository guix.

commit 223a3d7f7fdb6af9c4c090785cab15d38680e887
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Mon Apr 4 00:06:48 2022 -0400

    gnu: git: Update to 2.35.1.
    
    * gnu/packages/version-control.scm (git): Update to 2.35.1.
    [phases]: Delete trailing #t.
    
    Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
    Modified-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
---
 gnu/packages/version-control.scm | 49 +++++++++++++++-------------------------
 1 file changed, 18 insertions(+), 31 deletions(-)

diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index ac251dac3d..9466c4ab78 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -32,7 +32,7 @@
 ;;; Copyright © 2020, 2021, 2022 Vinicius Monego <monego@posteo.net>
 ;;; Copyright © 2020 Tanguy Le Carrour <tanguy@bioneland.org>
 ;;; Copyright © 2020, 2021 Michael Rohleder <mike@rohleder.de>
-;;; Copyright © 2021 Greg Hogan <code@greghogan.com>
+;;; Copyright © 2021, 2022 Greg Hogan <code@greghogan.com>
 ;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
 ;;; Copyright © 2021 Chris Marusich <cmmarusich@gmail.com>
 ;;; Copyright © 2021 Léo Le Bouter <lle-bout@zaclys.net>
@@ -221,14 +221,14 @@ Python 3.3 and later, rather than on Python 2.")
 (define-public git
   (package
    (name "git")
-   (version "2.34.0")
+   (version "2.35.1")
    (source (origin
             (method url-fetch)
             (uri (string-append "mirror://kernel.org/software/scm/git/git-"
                                 version ".tar.xz"))
             (sha256
              (base32
-              "07s1c9lzlm4kpbb5lmxy0869phg7037pv4faz5hlqyb5csrbjv7x"))))
+              "100h37cpw49pmlpf6lcpm1xi578gllf6y9in60h5mxj3cj754s6p"))))
    (build-system gnu-build-system)
    (native-inputs
     `(("native-perl" ,perl)
@@ -248,7 +248,7 @@ Python 3.3 and later, rather than on Python 2.")
                 version ".tar.xz"))
           (sha256
            (base32
-            "0wic95h0i1bm66hxnc38pfj31n74lvk2xb8lx6kcfpzg2wszmsj7"))))
+            "00rqdj2bc3i7pfc16pciiz50ww41jkqg18iy5hi5jnf0y98sgqz4"))))
       ;; For subtree documentation.
       ("asciidoc" ,asciidoc)
       ("docbook-xsl" ,docbook-xsl)
@@ -338,8 +338,7 @@ Python 3.3 and later, rather than on Python 2.")
                       (("uname_S := .*" all)
                        (if (equal? ,(%current-target-system) "i586-pc-gnu")
                          "uname_S := GNU\n"
-                         all)))
-                    #t)))
+                         all))))))
               ;; We do not have bash-for-tests when cross-compiling.
               `((add-after 'unpack 'modify-PATH
                   (lambda* (#:key inputs #:allow-other-keys)
@@ -349,28 +348,24 @@ Python 3.3 and later, rather than on Python 2.")
                       ;; similar does the right thing.
                       (setenv "PATH" (string-join
                                       (remove (cut string-prefix? bash-full 
<>) path)
-                                      ":"))
-                      #t)))))
+                                      ":")))))))
         ;; Add cross curl-config script to PATH when cross-compiling.
         ,@(if (%current-target-system)
               '((add-before 'configure 'add-cross-curl-config
                    (lambda* (#:key inputs #:allow-other-keys)
                      (setenv "PATH"
                              (string-append (assoc-ref inputs "curl") "/bin:"
-                                            (getenv "PATH")))
-                     #t)))
+                                            (getenv "PATH"))))))
               '())
         (add-after 'configure 'patch-makefiles
           (lambda _
             (substitute* "Makefile"
               (("/usr/bin/perl") (which "perl"))
-              (("/usr/bin/python") (which "python3")))
-            #t))
+              (("/usr/bin/python") (which "python3")))))
         (add-after 'configure 'add-PM.stamp
           (lambda _
             ;; Add the "PM.stamp" to avoid "no rule to make target".
-            (call-with-output-file "perl/PM.stamp" (const #t))
-            #t))
+            (call-with-output-file "perl/PM.stamp" (const #t))))
         (add-after 'build 'build-subtree
           (lambda* (#:key inputs #:allow-other-keys)
             (with-directory-excursion "contrib/subtree"
@@ -389,8 +384,7 @@ Python 3.3 and later, rather than on Python 2.")
               (invoke "make" "install")
               (invoke "make" "install-doc")
               (substitute* "git-subtree"
-                (("/bin/sh") (which "sh"))))
-            #t))
+                (("/bin/sh") (which "sh"))))))
         (add-before 'check 'patch-tests
           (lambda _
             (let ((store-directory (%store-directory)))
@@ -428,8 +422,7 @@ Python 3.3 and later, rather than on Python 2.")
               (for-each delete-file
                         '("t/t9128-git-svn-cmd-branch.sh"
                           "t/t9167-git-svn-cmd-branch-subproject.sh"
-                          "t/t9141-git-svn-multiple-branches.sh"))
-              #t)))
+                          "t/t9141-git-svn-multiple-branches.sh")))))
         (add-after 'install 'install-shell-completion
           (lambda* (#:key outputs #:allow-other-keys)
             (let* ((out         (assoc-ref outputs "out"))
@@ -437,8 +430,7 @@ Python 3.3 and later, rather than on Python 2.")
               ;; TODO: Install the tcsh and zsh completions in the right place.
               (mkdir-p completions)
               (copy-file "contrib/completion/git-completion.bash"
-                         (string-append completions "/git"))
-              #t)))
+                         (string-append completions "/git")))))
         (add-after 'install 'install-credential-netrc
           (lambda* (#:key outputs #:allow-other-keys)
             (let* ((netrc (assoc-ref outputs "credential-netrc")))
@@ -452,24 +444,22 @@ Python 3.3 and later, rather than on Python 2.")
               ;; community calls this "dotless @INC").
               (wrap-program (string-append netrc "/bin/git-credential-netrc")
                 `("PERL5LIB" ":" prefix
-                  (,(string-append (assoc-ref outputs "out") "/share/perl5"))))
-              #t)))
+                  (,(string-append (assoc-ref outputs "out")
+                                   "/share/perl5")))))))
         (add-after 'install 'install-credential-libsecret
           (lambda* (#:key outputs #:allow-other-keys)
             (let* ((libsecret (assoc-ref outputs "credential-libsecret")))
               (with-directory-excursion "contrib/credential/libsecret"
                 ((assoc-ref gnu:%standard-phases 'build))
                 (install-file "git-credential-libsecret"
-                              (string-append libsecret "/bin"))
-                #t))))
+                              (string-append libsecret "/bin"))))))
         (add-after 'install 'install-subtree
           (lambda* (#:key outputs #:allow-other-keys)
             (let ((subtree (assoc-ref outputs "subtree")))
               (install-file "contrib/subtree/git-subtree"
                             (string-append subtree "/bin"))
               (install-file "contrib/subtree/git-subtree.1"
-                            (string-append subtree "/share/man/man1"))
-              #t)))
+                            (string-append subtree "/share/man/man1")))))
          (add-after 'install 'restore-sample-hooks-shebang
            (lambda* (#:key outputs #:allow-other-keys)
              (let* ((out (assoc-ref outputs "out"))
@@ -478,8 +468,7 @@ Python 3.3 and later, rather than on Python 2.")
                            (format #t "restoring shebang on `~a'~%" file)
                            (substitute* file
                              (("^#!.*/bin/sh") "#!/bin/sh")))
-                         (find-files dir ".*"))
-               #t)))
+                         (find-files dir ".*")))))
         (add-after 'install 'split
           (lambda* (#:key inputs outputs #:allow-other-keys)
             ;; Split the binaries to the various outputs.
@@ -555,9 +544,7 @@ Python 3.3 and later, rather than on Python 2.")
               (wrap-program git-sm
                 `("PATH" ":" prefix
                   (,(string-append (assoc-ref inputs "perl")
-                                   "/bin"))))
-
-              #t)))
+                                   "/bin")))))))
         (add-after 'split 'install-man-pages
           (lambda* (#:key inputs outputs #:allow-other-keys)
             (let* ((out (assoc-ref outputs "out"))