diff options
| author | Ron <ron@debian.org> | 2013-11-28 04:18:45 +1030 |
|---|---|---|
| committer | Ron <ron@debian.org> | 2013-11-28 04:18:45 +1030 |
| commit | a1740d9ad176ed3716b5c35cba6c47da733b789c (patch) | |
| tree | a8784b55e290e2ef8039ac860e17b187559e3e8a | |
| parent | a8fa0cb629f076f546748673378694b8416e6c53 (diff) | |
| download | opus-a1740d9ad176ed3716b5c35cba6c47da733b789c.tar.gz | |
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.
| -rwxr-xr-x | update_version | 3 | ||||
| -rw-r--r-- | win32/genversion.bat | 2 |
2 files changed, 2 insertions, 3 deletions
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 diff --git a/win32/genversion.bat b/win32/genversion.bat index e8ebb026..a9b9353a 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*" --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 |