From a1740d9ad176ed3716b5c35cba6c47da733b789c Mon Sep 17 00:00:00 2001
From: Ron <ron@debian.org>
Date: Thu, 28 Nov 2013 04:18:45 +1030
Subject: Drop the use of --always to git-describe

This is a partial revert of c435f06b308e52d7a5d2aad9eec98a1541832b47,
since it didn't actually fix the original problem with shallow clones.
It returns just a hash, not something we (currently) can extract as a
version string in the form things are expecting.
---
 update_version | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'update_version')

diff --git a/update_version b/update_version
index 6086136d..a9999918 100755
--- a/update_version
+++ b/update_version
@@ -34,8 +34,7 @@ fi
 # -dirty from files that have been touched but are not actually altered in the
 # working dir.
 GIT_VERSION=$(cd "$SRCDIR" && git status > /dev/null 2>&1 \
-                           && git describe --tags --match 'v*' \
-                                           --always --dirty 2> /dev/null)
+                           && git describe --tags --match 'v*' --dirty 2> /dev/null)
 GIT_VERSION=${GIT_VERSION#v}
 
 if [ -n "$GIT_VERSION" ]; then
-- 
cgit v1.2.3