[git] GnuPG - branch, master, updated. gnupg-2.1.10-109-g96237b9

by NIIBE Yutaka cvs at cvs.gnupg.org
Wed Jan 13 09:26:45 CET 2016


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Guard".

The branch, master has been updated
       via  96237b9a63a50aed1884cb06f84279b977d6a8fa (commit)
      from  e2f984b4afffaa89bdeba2f5d447b5681237177e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
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>

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

-----------------------------------------------------------------------

Summary of changes:
 Makefile.am     | 2 +-
 autogen.sh      | 2 +-
 doc/Makefile.am | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org




More information about the Gnupg-commits mailing list