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

diff --git a/ef/72a34d6041e0f4887eb0ab8abfd8215d9307e2 b/ef/72a34d6041e0f4887eb0ab8abfd8215d9307e2
new file mode 100644 (file)
index 0000000..9a24a22
--- /dev/null
+++ b/ef/72a34d6041e0f4887eb0ab8abfd8215d9307e2
@@ -0,0 +1,71 @@
+Return-Path: <too@guru-group.fi>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+ by arlo.cworth.org (Postfix) with ESMTP id 184EE6DE0217\r
+ for <notmuch@notmuchmail.org>; Wed, 25 May 2016 14:04:51 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at cworth.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0.258\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0.258 tagged_above=-999 required=5 tests=[AWL=0.267, \r
+ HEADER_FROM_DIFFERENT_DOMAINS=0.001, T_RP_MATCHES_RCVD=-0.01]\r
+ autolearn=disabled\r
+Received: from arlo.cworth.org ([127.0.0.1])\r
+ by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id 9EAe1lyF_Qi6 for <notmuch@notmuchmail.org>;\r
+ Wed, 25 May 2016 14:04:41 -0700 (PDT)\r
+Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])\r
+ by arlo.cworth.org (Postfix) with ESMTP id CABFE6DE00EB\r
+ for <notmuch@notmuchmail.org>; Wed, 25 May 2016 14:04:40 -0700 (PDT)\r
+Received: by guru.guru-group.fi (Postfix, from userid 501)\r
+ id 47FBC1000C6; Thu, 26 May 2016 00:04:34 +0300 (EEST)\r
+From: Tomi Ollila <tomi.ollila@iki.fi>\r
+To: notmuch@notmuchmail.org\r
+Cc: tomi.ollila@iki.fi\r
+Subject: [PATCH 1/3] Makefile.local: set IS_GIT = yes when regular file\r
+ $srcdir/.git exists\r
+Date: Thu, 26 May 2016 00:04:30 +0300\r
+Message-Id: <1464210272-26281-1-git-send-email-tomi.ollila@iki.fi>\r
+X-Mailer: git-send-email 2.8.2\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.20\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+ <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <https://notmuchmail.org/mailman/options/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch/>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <https://notmuchmail.org/mailman/listinfo/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Wed, 25 May 2016 21:04:51 -0000\r
+\r
+$srcdir/.git may also be file. E.g. `git worktree` creates .git file\r
+while new working tree is populated.\r
+---\r
+\r
+This first patch is useful for developers/testers who use git worktree\r
+to get accurate version information. rest are not in such a hurry\r
+(to be tested, I'll have these in by build circle around).\r
+\r
+ Makefile.local | 2 +-\r
+ 1 file changed, 1 insertion(+), 1 deletion(-)\r
+\r
+diff --git a/Makefile.local b/Makefile.local\r
+index 6b413420b8d9..a1e9578441a4 100644\r
+--- a/Makefile.local\r
++++ b/Makefile.local\r
+@@ -10,7 +10,7 @@\r
+ # repository), we let git append identification of the actual commit.\r
+ PACKAGE=notmuch\r
+ \r
+-IS_GIT=$(shell if [ -d ${srcdir}/.git ] ; then echo yes ; else echo no; fi)\r
++IS_GIT=$(shell if [ -d ${srcdir}/.git -o -f ${srcdir}/.git ] ; then echo yes ; else echo no; fi)\r
+ \r
+ ifeq ($(IS_GIT),yes)\r
+ DATE:=$(shell git --git-dir=${srcdir}/.git log --date=short -1 --pretty=format:%cd)\r
+-- \r
+2.8.2\r
+\r