aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2014-06-03 11:44:15 +0200
committerLukas Larsson <[email protected]>2014-06-03 11:44:15 +0200
commita4dac83e01f7f74ccad5ee1f81bdb12808e2d9e0 (patch)
tree5222de0b142134864bdefbbfb8fa3d92d2da57c3 /erts/emulator
parent6c2c2d2026ed7f2243af98cbe7bbf7f58883af10 (diff)
parent74d314b0085d5b83b1c7e9aefee8e770b66f93cb (diff)
downloadotp-a4dac83e01f7f74ccad5ee1f81bdb12808e2d9e0.tar.gz
otp-a4dac83e01f7f74ccad5ee1f81bdb12808e2d9e0.tar.bz2
otp-a4dac83e01f7f74ccad5ee1f81bdb12808e2d9e0.zip
Merge branch 'lukas/erts/git_vsn_script_fix/OTP-11961' into maint
* lukas/erts/git_vsn_script_fix/OTP-11961: erts: Fix git version script
Diffstat (limited to 'erts/emulator')
-rwxr-xr-xerts/emulator/utils/gen_git_version6
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