Skip to content

Commit a1740d9

Browse files
author
Ron
committed
Drop the use of --always to git-describe
This is a partial revert of c435f06, 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.
1 parent a8fa0cb commit a1740d9

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

update_version

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,7 @@ fi
3434
# -dirty from files that have been touched but are not actually altered in the
3535
# working dir.
3636
GIT_VERSION=$(cd "$SRCDIR" && git status > /dev/null 2>&1 \
37-
&& git describe --tags --match 'v*' \
38-
--always --dirty 2> /dev/null)
37+
&& git describe --tags --match 'v*' --dirty 2> /dev/null)
3938
GIT_VERSION=${GIT_VERSION#v}
4039

4140
if [ -n "$GIT_VERSION" ]; then

win32/genversion.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
setlocal enableextensions enabledelayedexpansion
44

5-
for /f %%v in ('git --git-dir="%~dp0..\.git" describe --tags --match "v*" --always') do set version=%%v
5+
for /f %%v in ('git --git-dir="%~dp0..\.git" describe --tags --match "v*"') do set version=%%v
66

77
if not "%version%"=="" goto :gotversion
88

0 commit comments

Comments
 (0)