summaryrefslogtreecommitdiff
path: root/guix/git-download.scm
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2023-03-02 13:05:46 +0100
committerLudovic Courtès <ludo@gnu.org>2023-03-03 12:28:22 +0100
commit58f20fa8181bdcd4269671e1d3cef1268947af3a (patch)
tree6d2118e2673b6148984ff44ec6fc24913be4a165 /guix/git-download.scm
parent4f681cdbc27e6a922f24d4297efe3c0b823195f0 (diff)
git-download: Apply Git attributes on checkouts coming from SWH.
Fixes a bug whereby CR/LF conversion, for instance, would not be applied on Git repositories retrieved from SWH: https://sympa.inria.fr/sympa/arc/swh-devel/2023-03/msg00000.html Reported by Simon Tournier <simon.tournier@inserm.fr>. Suggested by Valentin Lorentz <valentin.lorentz@inria.fr>. Co-authored by Simon Tournier <simon.tournier@inserm.fr>. * guix/git-download.scm (git-fetch)[build]: Add Git operations conditioned by '.gitattributes' on the result from SWH. Signed-off-by: Ludovic Courtès <ludo@gnu.org>
Diffstat (limited to 'guix/git-download.scm')
-rw-r--r--guix/git-download.scm43
1 files changed, 31 insertions, 12 deletions
diff --git a/guix/git-download.scm b/guix/git-download.scm
index a1566bed4d..3dc306e39d 100644
--- a/guix/git-download.scm
+++ b/guix/git-download.scm
@@ -1,8 +1,9 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2014-2021, 2023 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2017 Mathieu Lirzin <mthl@gnu.org>
;;; Copyright © 2017 Christopher Baines <mail@cbaines.net>
;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
+;;; Copyright © 2023 Simon Tournier <zimon.toutoune@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -84,16 +85,18 @@
object. The output is expected to have recursive hash HASH of type
HASH-ALGO (a symbol). Use NAME as the file name, or a generic name if #f."
(define inputs
- ;; When doing 'git clone --recursive', we need sed, grep, etc. to be
- ;; available so that 'git submodule' works.
- (if (git-reference-recursive? ref)
- (standard-packages)
+ `(("git" ,git)
- ;; The 'swh-download' procedure requires tar and gzip.
- `(("gzip" ,(module-ref (resolve-interface '(gnu packages compression))
- 'gzip))
- ("tar" ,(module-ref (resolve-interface '(gnu packages base))
- 'tar)))))
+ ;; When doing 'git clone --recursive', we need sed, grep, etc. to be
+ ;; available so that 'git submodule' works.
+ ,@(if (git-reference-recursive? ref)
+ (standard-packages)
+
+ ;; The 'swh-download' procedure requires tar and gzip.
+ `(("gzip" ,(module-ref (resolve-interface '(gnu packages compression))
+ 'gzip))
+ ("tar" ,(module-ref (resolve-interface '(gnu packages base))
+ 'tar))))))
(define guile-json
(module-ref (resolve-interface '(gnu packages guile)) 'guile-json-4))
@@ -151,7 +154,7 @@ HASH-ALGO (a symbol). Use NAME as the file name, or a generic name if #f."
(or (git-fetch (getenv "git url") (getenv "git commit")
#$output
#:recursive? recursive?
- #:git-command (string-append #+git "/bin/git"))
+ #:git-command "git")
(download-nar #$output)
;; As a last resort, attempt to download from Software Heritage.
@@ -162,8 +165,24 @@ HASH-ALGO (a symbol). Use NAME as the file name, or a generic name if #f."
(parameterize ((%verify-swh-certificate? #f))
(format (current-error-port)
"Trying to download from Software Heritage...~%")
+
(swh-download (getenv "git url") (getenv "git commit")
- #$output))))))))
+ #$output)
+ (when (file-exists?
+ (string-append #$output "/.gitattributes"))
+ ;; Perform CR/LF conversion and other changes
+ ;; specificied by '.gitattributes'.
+ (invoke "git" "-C" #$output "init")
+ (invoke "git" "-C" #$output "config" "--local"
+ "user.email" "you@example.org")
+ (invoke "git" "-C" #$output "config" "--local"
+ "user.name" "Your Name")
+ (invoke "git" "-C" #$output "add" ".")
+ (invoke "git" "-C" #$output "commit" "-am" "init")
+ (invoke "git" "-C" #$output "read-tree" "--empty")
+ (invoke "git" "-C" #$output "reset" "--hard")
+ (delete-file-recursively
+ (string-append #$output "/.git"))))))))))
(mlet %store-monad ((guile (package->derivation guile system)))
(gexp->derivation (or name "git-checkout") build