diff options
| author | Lukas Larsson <[email protected]> | 2014-06-03 11:44:32 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2014-06-03 11:44:32 +0200 |
| commit | 656477cae3abc2b73b1bc31d3d758c5d353b18b2 (patch) | |
| tree | 11339aa69a7e6d8b02220a316a4fe1140e0ffea4 | |
| parent | cf36f119c7e06b908bf70a18f491cb3e959166fe (diff) | |
| parent | a4dac83e01f7f74ccad5ee1f81bdb12808e2d9e0 (diff) | |
| download | otp-656477cae3abc2b73b1bc31d3d758c5d353b18b2.tar.gz otp-656477cae3abc2b73b1bc31d3d758c5d353b18b2.tar.bz2 otp-656477cae3abc2b73b1bc31d3d758c5d353b18b2.zip | |
Merge branch 'maint'
* maint:
erts: Fix git version script
| -rwxr-xr-x | erts/emulator/utils/gen_git_version | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/erts/emulator/utils/gen_git_version b/erts/emulator/utils/gen_git_version index ef06a4b8e2..9faf015b62 100755 --- a/erts/emulator/utils/gen_git_version +++ b/erts/emulator/utils/gen_git_version @@ -5,9 +5,9 @@ OUTPUT_FILE=$1 if command -v git 2>&1 >/dev/null && test -d $ERL_TOP/.git -o -f $ERL_TOP/.git then - VSN=`git describe --match "OTP_R[0-9][0-9][A-B]*" HEAD` + VSN=`git describe --match "OTP-[0-9]*" HEAD` case "$VSN" in - OTP_R*-g*) + OTP-*-g*) VSN=`echo $VSN | sed -e 's/.*-g\\(.*\\)/\\1/g'` ;; *) VSN="na" ;; esac @@ -36,4 +36,4 @@ then fi exit 0 fi -exit 1
\ No newline at end of file +exit 1 |