From ce9a7fd6ffd6881a40a44a4722e68218fccbe29c Mon Sep 17 00:00:00 2001
From: Chris Willis-Ford <cwillisf@acm.org>
Date: Wed, 15 Jul 2015 13:34:01 -0700
Subject: [PATCH] Fixes for git-commit-id macro

All variables used by git-commit-id (except the output) are now local.
The git command now runs in the repository directory instead of current.
---
 build-common.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/build-common.xml b/build-common.xml
index 0d79467..777f9ce 100644
--- a/build-common.xml
+++ b/build-common.xml
@@ -13,8 +13,9 @@
         <attribute name="outputproperty"/>
         <sequential>
             <local name="git.present"/>
+            <local name="git.revision"/>
             <available file="@{repository}/.git" property="git.present"/>
-            <exec executable="git" outputproperty="git.revision" failifexecutionfails="false">
+            <exec executable="git" dir="@{repository}" outputproperty="git.revision" failifexecutionfails="false">
                 <arg line="describe --dirty --tags --always"/>
             </exec>
             <condition property="@{outputproperty}" value="${git.revision}" else="unknown">