[Pkg-gnupg-commit] [gnupg2] 109/159: Fix to support git worktree.

[Daniel Kahn Gillmor]

This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch master
in repository gnupg2.

commit 96237b9a63a50aed1884cb06f84279b977d6a8fa
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Wed Jan 13 17:22:37 2016 +0900

    Fix to support git worktree.
    
    * autogen.sh, Makefile.am, doc/Makefile.am: Use -e for testing .git.
    
    --
    Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>
---
 Makefile.am     | 2 +-
 autogen.sh      | 2 +-
 doc/Makefile.am | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 8e213f3..8bff2ef 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -120,7 +120,7 @@ endif
 gen_start_date = 2011-12-01T06:00:00
 .PHONY: gen-ChangeLog
 gen-ChangeLog:
-	if test -d $(top_srcdir)/.git; then				\
+	if test -e $(top_srcdir)/.git; then				\
 	  (cd $(top_srcdir) &&                      			\
 	    $(GITLOG_TO_CHANGELOG) --append-dot --tear-off		\
 	    --amend=build-aux/git-log-fix 				\
diff --git a/autogen.sh b/autogen.sh
index 3fe24ea..7d843bd 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -214,7 +214,7 @@ if [ "$myhost" = "find-version" ]; then
     esac
 
     beta=no
-    if [ -d .git ]; then
+    if [ -e .git ]; then
       ingit=yes
       tmp=$(git describe --match "${matchstr1}" --long 2>/dev/null)
       if [ -n "$tmp" ]; then
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 5449d07..a1a570c 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -136,7 +136,7 @@ dist-hook: defsincdate
 
 defsincdate: $(gnupg_TEXINFOS)
 	: >defsincdate ; \
-	if test -d $(top_srcdir)/.git; then \
+	if test -e $(top_srcdir)/.git; then \
 	  (cd $(srcdir) && git log -1 --format='%ct' \
                -- $(gnupg_TEXINFOS) 2>/dev/null) >>defsincdate; \
 	fi

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git