~ruther/guix-local: guix hash: '-x' excludes '.git' even when it is a regular file.

eeb05e87d3d424b2f80b7e1ecb945c088ac6e201 — Ludovic Courtès 9 years ago 1a49a10

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.

patch browse .tar.gz

1 files changed, 4 insertions(+), 1 deletions(-)

M guix/scripts/hash.scm

M guix/scripts/hash.scm => guix/scripts/hash.scm +4 -1

@@ 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)))