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

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

[Tomi Ollila]

$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

[PATCH 2/3] Makefile.local: make IS_GIT simply expanded

[Tomi Ollila]

By using ':=' while setting IS_GIT it is expanded to 'yes' or 'no' at
that point (and not every time when $(IS_GIT) is referenced).
---
 Makefile.local | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile.local b/Makefile.local
index a1e9578441a4..ee3cf18f5757 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 -o -f ${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

[PATCH 3/3] Makefile.local: use $(wildcard) to check existence of ${srcdir}/.git

[Tomi Ollila]

With this GNU Make construct one shell invocation can be skipped
and code looks shorter (narrower). This would now match to .git
being other file type than regular file or directory (or symlink
to those), but that is not a use case anyone should expect users
to do.
---
 Makefile.local | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile.local b/Makefile.local
index ee3cf18f5757..045549b54442 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 -o -f ${srcdir}/.git ] ; then echo yes ; else echo no; fi)
+IS_GIT:=$(if $(wildcard ${srcdir}/.git),yes,no)
 
 ifeq ($(IS_GIT),yes)
 DATE:=$(shell git --git-dir=${srcdir}/.git log --date=short -1 --pretty=format:%cd)
-- 
2.8.2

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

[David Bremner]

Tomi Ollila <tomi.ollila@iki.fi> writes:

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

pushed the first patch only

d

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

[David Bremner]

David Bremner <david@tethera.net> writes:

> Tomi Ollila <tomi.ollila@iki.fi> writes:
>
>> $srcdir/.git may also be file. E.g. `git worktree` creates .git file
>> while new working tree is populated.
>
> pushed the first patch only
>

Pushed the second two patches

d