diff options
author | Ludovic Courtès <ludo@gnu.org> | 2017-01-02 15:23:21 +0100 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2017-01-02 15:23:21 +0100 |
commit | eeb05e87d3d424b2f80b7e1ecb945c088ac6e201 (patch) | |
tree | b3a311255b1fd9e453be0f647a4478b33e3e9e4e | |
parent | 1a49a10a94e90dc8bb4ce80d2dc2fa21acf76424 (diff) | |
download | patches-eeb05e87d3d424b2f80b7e1ecb945c088ac6e201.tar patches-eeb05e87d3d424b2f80b7e1ecb945c088ac6e201.tar.gz |
guix hash: '-x' excludes '.git' even when it is a regular file.
* guix/scripts/hash.scm (guix-hash)[vcs-file?]: Add case for '.git'
regular files.
-rw-r--r-- | guix/scripts/hash.scm | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/guix/scripts/hash.scm b/guix/scripts/hash.scm index a339a8556b..640b2417d2 100644 --- a/guix/scripts/hash.scm +++ b/guix/scripts/hash.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013, 2014, 2016 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2012, 2013, 2014, 2016, 2017 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2013 Nikita Karetnikov <nikita@karetnikov.org> ;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org> ;;; @@ -116,6 +116,9 @@ and 'hexadecimal' can be used as well).\n")) (case (stat:type stat) ((directory) (member (basename file) '(".bzr" ".git" ".hg" ".svn" "CVS"))) + ((regular) + ;; Git sub-modules have a '.git' file that is a regular text file. + (string=? (basename file) ".git")) (else #f))) |