Merge branch 'release-1.2' into missy for 1.2.0 v1.2.0

1 files changed, 8 insertions, 5 deletions

diff --git a/version.sh b/version.sh
index 0c9d3d6..9785ba6 100755
--- a/version.sh
+++ b/version.sh
@@ -1,9 +1,12 @@
 #!/bin/sh
-hash=$(git --git-dir="$(dirname $0)/.git" rev-parse --short HEAD 2>/dev/null)
-branch=$(git --git-dir="$(dirname $0)/.git" rev-parse --abbrev-ref HEAD | sed -r 's/.*[^0-9A-Za-z-]([0-9A-Za-z-]*)$/\1/g')
-
-if [ -n "$hash" ] || [ -n "$branch" ]
+if command -v git 2>/dev/null >/dev/null
 then
-	printf '+g%s.%s' "$hash" "$branch"
+	hash=$(git --git-dir="$(dirname $0)/.git" rev-parse --short HEAD 2>/dev/null)
+	branch=$(git --git-dir="$(dirname $0)/.git" rev-parse --abbrev-ref HEAD 2>/dev/null | sed -r 's/.*[^0-9A-Za-z-]([0-9A-Za-z-]*)$/\1/g')
+
+	if [ -n "$hash" ] || [ -n "$branch" ]
+	then
+		printf '+g%s.%s' "$hash" "$branch"
+	fi
 fi
 echo