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
marianoguerra · Jun 3, 2014 · a4dac83 · a4dac83
2 parents 6c2c2d2 + 74d314b
commit a4dac83
Showing 1 changed file with 3 additions and 3 deletions.
diff --git 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
+exit 1