Include commit hash if possible in versioning script, if a non-stable tree is compiled

get_version.sh

@@ -2,6 +2,7 @@
 
 SCRIPT_DIR=$(dirname "$0")
 DIRTY=""
+VERSION=""
 
 if [ -d ${SCRIPT_DIR}/.git ] && git status 1>/dev/null 2>/dev/null
 then
@@ -31,9 +32,11 @@ then
             DIRTY="-dirty"
         fi
     fi
+    if git describe 1>/dev/null 2>/dev/null
+    then
         VERSION=$(git describe 2>/dev/null)$DIRTY
-elif [ -d ${SCRIPT_DIR}/.git ] && git log -n 1 1>/dev/null 2>/dev/null
-then
+    elif git log -n 1 1>/dev/null 2>/dev/null
+    then
         VERSION=$(head -n 1 "${SCRIPT_DIR}/ChangeLog" | cut -d ' ' -f 2)
         if [ "$VERSION" = "master" ]
         then
@@ -41,7 +44,11 @@ then
             HASH=$(git log -n 1 --pretty=format:"%h" 2>/dev/null)
             VERSION=$PREVIOUS-$HASH
         fi
-else
+    fi
+fi
+
+if [ -z "$VERSION" ]
+then
     VERSION=$(head -n 1 "${SCRIPT_DIR}/ChangeLog" | cut -d ' ' -f 2)
     if [ "$VERSION" = "master" ]
     then
@@ -49,7 +56,6 @@ else
     fi
 fi
 
-
 VERSION=$(echo "$VERSION" | sed 's/^v//')
 
 echo '#define VERSION_STRING "'$VERSION'"' > version.h