From: Tomi Ollila <tomi.ollila@iki.fi>
Date: Wed, 25 May 2016 21:04:30 +0000 (+0300)
Subject: [PATCH 1/3] Makefile.local: set IS_GIT = yes when regular file $srcdir/.git exists
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e398aed0a3c6b32f446ab6c278e6913a0454e478;p=notmuch-archives.git

[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
index 000000000..9a24a22eb
--- /dev/null
+++ b/ef/72a34d6041e0f4887eb0ab8abfd8215d9307e2
@@ -0,0 +1,71 @@
+Return-Path: <too@guru-group.fi>
+X-Original-To: notmuch@notmuchmail.org
+Delivered-To: notmuch@notmuchmail.org
+Received: from localhost (localhost [127.0.0.1])
+ by arlo.cworth.org (Postfix) with ESMTP id 184EE6DE0217
+ for <notmuch@notmuchmail.org>; Wed, 25 May 2016 14:04:51 -0700 (PDT)
+X-Virus-Scanned: Debian amavisd-new at cworth.org
+X-Spam-Flag: NO
+X-Spam-Score: 0.258
+X-Spam-Level: 
+X-Spam-Status: No, score=0.258 tagged_above=-999 required=5 tests=[AWL=0.267, 
+ HEADER_FROM_DIFFERENT_DOMAINS=0.001, T_RP_MATCHES_RCVD=-0.01]
+ autolearn=disabled
+Received: from arlo.cworth.org ([127.0.0.1])
+ by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024)
+ with ESMTP id 9EAe1lyF_Qi6 for <notmuch@notmuchmail.org>;
+ Wed, 25 May 2016 14:04:41 -0700 (PDT)
+Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])
+ by arlo.cworth.org (Postfix) with ESMTP id CABFE6DE00EB
+ for <notmuch@notmuchmail.org>; Wed, 25 May 2016 14:04:40 -0700 (PDT)
+Received: by guru.guru-group.fi (Postfix, from userid 501)
+ id 47FBC1000C6; Thu, 26 May 2016 00:04:34 +0300 (EEST)
+From: Tomi Ollila <tomi.ollila@iki.fi>
+To: notmuch@notmuchmail.org
+Cc: tomi.ollila@iki.fi
+Subject: [PATCH 1/3] Makefile.local: set IS_GIT = yes when regular file
+ $srcdir/.git exists
+Date: Thu, 26 May 2016 00:04:30 +0300
+Message-Id: <1464210272-26281-1-git-send-email-tomi.ollila@iki.fi>
+X-Mailer: git-send-email 2.8.2
+X-BeenThere: notmuch@notmuchmail.org
+X-Mailman-Version: 2.1.20
+Precedence: list
+List-Id: "Use and development of the notmuch mail system."
+ <notmuch.notmuchmail.org>
+List-Unsubscribe: <https://notmuchmail.org/mailman/options/notmuch>,
+ <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
+List-Archive: <http://notmuchmail.org/pipermail/notmuch/>
+List-Post: <mailto:notmuch@notmuchmail.org>
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
+List-Subscribe: <https://notmuchmail.org/mailman/listinfo/notmuch>,
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
+X-List-Received-Date: Wed, 25 May 2016 21:04:51 -0000
+
+$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
+