[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#61910] [PATCH v2] git-download: Apply CR/LF to Git repository from
From: |
Simon Tournier |
Subject: |
[bug#61910] [PATCH v2] git-download: Apply CR/LF to Git repository from SWH. |
Date: |
Thu, 2 Mar 2023 13:05:46 +0100 |
From: Ludovic Courtès <ludo@gnu.org>
Fixes a bug whereby CR/LF convention 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.
---
guix/git-download.scm | 24 ++++++++++++++++++++++--
1 file changed, 22 insertions(+), 2 deletions(-)
Hi,
This uses 'flat' as previously but applies some Git commands for fixing CR/LF
when .gitattributes is present or not. It works on the example hidapi.
I have not tried for other examples.
WDYT?
Cheers,
simon
diff --git a/guix/git-download.scm b/guix/git-download.scm
index a1566bed4d..be0b13615c 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.
;;;
@@ -162,8 +163,27 @@ (define recursive?
(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)
+ ;; Perform CR/LF conversion if specificied by
.gitattributes
+ (when (find-files "." ".gitattributes")
+ (invoke #+(file-append git "/bin/git") "-C" #$output
+ "init")
+ (invoke #+(file-append git "/bin/git") "-C" #$output
+ "config" "--local" "user.email"
"you@example.org")
+ (invoke #+(file-append git "/bin/git") "-C" #$output
+ "config" "--local" "user.name" "Your Name")
+ (invoke #+(file-append git "/bin/git") "-C" #$output
+ "add" ".")
+ (invoke #+(file-append git "/bin/git") "-C" #$output
+ "commit" "-am" "'init'")
+ (invoke #+(file-append git "/bin/git") "-C" #$output
+ "read-tree" "--empty")
+ (invoke #+(file-append git "/bin/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
base-commit: af95f2d8f98eb2c8c64954bb2fd0b70838899174
--
2.38.1
- [bug#61910] [PATCH] git-download: Download a bare Git repository from SWH., Ludovic Courtès, 2023/03/02
- [bug#61910] [PATCH] git-download: Download a bare Git repository from SWH., Simon Tournier, 2023/03/02
- [bug#61910] [PATCH v2] git-download: Apply CR/LF to Git repository from SWH.,
Simon Tournier <=
- [bug#61910] [PATCH] git-download: Download a bare Git repository from SWH., Ludovic Courtès, 2023/03/02
- [bug#61910] [PATCH] git-download: Download a bare Git repository from SWH., Simon Tournier, 2023/03/02
- [bug#61910] [PATCH] git-download: Download a bare Git repository from SWH., Simon Tournier, 2023/03/02
- [bug#61910] [PATCH] git-download: Download a bare Git repository from SWH., Ludovic Courtès, 2023/03/03
- bug#61910: [PATCH] git-download: Download a bare Git repository from SWH., Ludovic Courtès, 2023/03/03
- [bug#61910] [PATCH] git-download: Download a bare Git repository from SWH., Simon Tournier, 2023/03/03