From c435f06b308e52d7a5d2aad9eec98a1541832b47 Mon Sep 17 00:00:00 2001
From: Ralph Giles <giles@mozilla.com>
Date: Tue, 1 Oct 2013 13:05:33 -0700
Subject: [PATCH] Pass --always to git describe.
This generates a useful version string even for --depth=1 checkouts.
The option was added in git v1.6.6.
---
update_version | 3 ++-
win32/genversion.bat | 4 ++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/update_version b/update_version
index a9999918d..6086136d7 100755
--- a/update_version
+++ b/update_version
@@ -34,7 +34,8 @@ 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*' --dirty 2> /dev/null)
+ && git describe --tags --match 'v*' \
+ --always --dirty 2> /dev/null)
GIT_VERSION=${GIT_VERSION#v}
if [ -n "$GIT_VERSION" ]; then
diff --git a/win32/genversion.bat b/win32/genversion.bat
index 82885be71..b493cd470 100644
--- a/win32/genversion.bat
+++ b/win32/genversion.bat
@@ -2,7 +2,7 @@
setlocal enableextensions enabledelayedexpansion
-for /f %%v in ('git --git-dir="%~dp0..\.git" describe --tags --match "v*"') do set version=%%v
+for /f %%v in ('git --git-dir="%~dp0..\.git" describe --tags --match "v*" --always --dirty') do set version=%%v
if not "%version%"=="" goto :gotversion
@@ -43,4 +43,4 @@ copy /y "%1_temp" "%1"
:exit
-del "%1_temp"
\ No newline at end of file
+del "%1_temp"
--
GitLab