From 00930b217d6c936eb36388a38a3e52f611e20b74 Mon Sep 17 00:00:00 2001
From: o9000 <o9000>
Date: Sat, 25 Apr 2015 00:07:25 +0200
Subject: [PATCH] Fix git version script

---
 get_version.sh  | 22 ++++++++++++++++------
 make_release.sh |  2 +-
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/get_version.sh b/get_version.sh
index ed0cf00..90282a3 100755
--- a/get_version.sh
+++ b/get_version.sh
@@ -4,17 +4,27 @@ git update-index -q --ignore-submodules --refresh
 # Disallow unstaged changes in the working tree
 if ! git diff-files --quiet --ignore-submodules --
 then
-    echo >&2 "Error: there are unstaged changes."
-    git diff-files --name-status -r --ignore-submodules -- >&2
-    exit 1
+    if [ "$1" = "--strict" ]
+    then
+        echo >&2 "Error: there are unstaged changes."
+        git diff-files --name-status -r --ignore-submodules -- >&2
+        exit 1
+    else
+        echo "dirty"
+    fi
 fi
 
 # Disallow uncommitted changes in the index
 if ! git diff-index --cached --quiet HEAD --ignore-submodules --
 then
-    echo >&2 "Error: there are uncommitted changes."
-    git diff-index --cached --name-status -r --ignore-submodules HEAD -- >&2
-    exit 1
+    if [ "$1" = "--strict" ]
+    then
+        echo >&2 "Error: there are uncommitted changes."
+        git diff-index --cached --name-status -r --ignore-submodules HEAD -- >&2
+        exit 1
+    else
+        echo "dirty"
+    fi
 fi
 
 git describe --exact-match 2>/dev/null || echo "0.11-git$(git show -s --pretty=format:%cI.%h | tr -d ':' | tr -d '-' | tr '.' '-' | sed 's/T[0-9\+]*//g')"
diff --git a/make_release.sh b/make_release.sh
index b679219..667c706 100755
--- a/make_release.sh
+++ b/make_release.sh
@@ -19,7 +19,7 @@
 #
 # git checkout master
 
-VERSION=$(./get_version.sh)
+VERSION=$(./get_version.sh --strict)
 if [ ! $? -eq 0 ]
 then
     echo >&2 "Error: get_version.sh failed!"