[PATCH 1/3] Makefile.local: set IS_GIT = yes when regular file $srcdir/.git exists

Tomi Ollila tomi.ollila at iki.fi
Wed May 25 14:04:30 PDT 2016


$srcdir/.git may also be file. E.g. `git worktree` creates .git file
while new working tree is populated.
---

This first patch is useful for developers/testers who use git worktree
to get accurate version information. rest are not in such a hurry
(to be tested, I'll have these in by build circle around).

 Makefile.local | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile.local b/Makefile.local
index 6b413420b8d9..a1e9578441a4 100644
--- a/Makefile.local
+++ b/Makefile.local
@@ -10,7 +10,7 @@
 # repository), we let git append identification of the actual commit.
 PACKAGE=notmuch
 
-IS_GIT=$(shell if [ -d ${srcdir}/.git ] ; then echo yes ; else echo no; fi)
+IS_GIT=$(shell if [ -d ${srcdir}/.git -o -f ${srcdir}/.git ] ; then echo yes ; else echo no; fi)
 
 ifeq ($(IS_GIT),yes)
 DATE:=$(shell git --git-dir=${srcdir}/.git log --date=short -1 --pretty=format:%cd)
-- 
2.8.2



More information about the notmuch mailing list