From ac36914b986dfdab80d1243344f1b9a5b97a6247 Mon Sep 17 00:00:00 2001 From: Adam Sutton Date: Mon, 4 Feb 2013 14:11:07 +0000 Subject: [PATCH] Fix #1596 - some version of git don't like describe in subdir --- support/version | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/support/version b/support/version index 7d5c40ea..68d4fc85 100755 --- a/support/version +++ b/support/version @@ -8,11 +8,11 @@ FILE=$1 # Calculate version if [ -d ".git" ]; then - VER=$(cd $(dirname $0); git describe --dirty --match "v*" 2> /dev/null) + VER=$(cd $(dirname $0)/..; git describe --dirty --match "v*" 2> /dev/null) if [ $? -ne 0 ]; then # Git describe failed, maybe "--dirty" option is not available # Adding "-unknown" postfix to mark this situation - VER=$(cd $(dirname $0); git describe --match "v*" 2> /dev/null)-unknown + VER=$(cd $(dirname $0)/..; git describe --match "v*" 2> /dev/null)-unknown fi VER=$(echo $VER | sed "s/^v//" | sed "s/-\([0-9]*\)-\(g[0-9a-f]*\)/.\1~\2/") else