Skip to content
Snippets Groups Projects
Commit a1740d9a authored by Ron's avatar Ron
Browse files

Drop the use of --always to git-describe

This is a partial revert of c435f06b,
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.
parent a8fa0cb6
No related branches found
No related tags found
No related merge requests found
......@@ -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
......
......@@ -2,7 +2,7 @@
setlocal enableextensions enabledelayedexpansion
for /f %%v in ('git --git-dir="%~dp0..\.git" describe --tags --match "v*" --always') do set version=%%v
for /f %%v in ('git --git-dir="%~dp0..\.git" describe --tags --match "v*"') do set version=%%v
if not "%version%"=="" goto :gotversion
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment