[commit: ghc] master: Correctly detect GIT in a subtree (66cb344)

git at git.haskell.org git at git.haskell.org
Mon Oct 29 22:13:23 UTC 2018


Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/66cb344dc70d447d2d1c8bc3865bc5a8e68a8656/ghc

>---------------------------------------------------------------

commit 66cb344dc70d447d2d1c8bc3865bc5a8e68a8656
Author: Sylvain Henry <sylvain at haskus.fr>
Date:   Mon Oct 29 19:02:45 2018 +0100

    Correctly detect GIT in a subtree
    
    When we use a git subtree, .git is a file, not a directory.
    The script was already fixed for the commit ID but not for its date.
    
    PR: https://github.com/ghc/ghc/pull/212/


>---------------------------------------------------------------

66cb344dc70d447d2d1c8bc3865bc5a8e68a8656
 aclocal.m4 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/aclocal.m4 b/aclocal.m4
index 55b4162..18e0d7e 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1536,7 +1536,7 @@ if test "$RELEASE" = "NO"; then
     if test -f VERSION_DATE; then
         PACKAGE_VERSION=${PACKAGE_VERSION}.`cat VERSION_DATE`
         AC_MSG_RESULT(given $PACKAGE_VERSION)
-    elif test -d .git; then
+    elif test -e .git; then
         changequote(, )dnl
         ver_posixtime=`git log -1 --pretty=format:%ct`
         ver_date=`perl -MPOSIX -e "print strftime('%Y%m%d', gmtime($ver_posixtime));"`



More information about the ghc-commits mailing list