On 15.10.15 18:36, Nicolas Morey-Chaisemartin wrote:
Git hash was modified to handled non git builds but when building
out of tree, it detects a .git folder but do not change to this
folder to run git command.

Signed-off-by: Nicolas Morey-Chaisemartin <nmo...@kalray.eu>

Tested-by: Ivan Khoronzhuk <ivan.khoronz...@linaro.org>

---
  scripts/git_hash.sh | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/git_hash.sh b/scripts/git_hash.sh
index 6cfec2f..e15094e 100755
--- a/scripts/git_hash.sh
+++ b/scripts/git_hash.sh
@@ -8,8 +8,8 @@ ROOTDIR=${1}

  CUSTOM_STR=${CUSTOM_STR:-https://git.linaro.org/lng/odp.git}
  if [ -d ${ROOTDIR}/.git ]; then
-       hash=$(git describe | tr -d "\n")
-       if git diff-index --name-only HEAD &>/dev/null ; then
+       hash=$(git --git-dir=${ROOTDIR}/.git describe | tr -d "\n")
+       if git --git-dir=${ROOTDIR}/.git diff-index --name-only HEAD 
&>/dev/null ; then
                dirty=-dirty
        fi



--
Regards,
Ivan Khoronzhuk
_______________________________________________
lng-odp mailing list
lng-odp@lists.linaro.org
https://lists.linaro.org/mailman/listinfo/lng-odp

Reply via email to