handle tags like XXX_1_2_3 as well as 1.2.3

This commit is contained in:
2015-09-24 14:35:42 +02:00
parent f8884535a1
commit 7aaa821b79
+10 -2
View File
@@ -155,7 +155,7 @@ scanmatch $git_context {fatal: No names found} {
set version test
}
scanmatch $git_context {_([0-9]+)[_.]([0-9]+)([_.]([0-9]+))?$} {
scanmatch $git_context {([0-9]+)\.([0-9]+)(\.([0-9]+))?$} {
set major $matchInfo(submatch0)
set minor $matchInfo(submatch1)
set patch [expr $matchInfo(submatch3) + 0]
@@ -163,7 +163,15 @@ scanmatch $git_context {_([0-9]+)[_.]([0-9]+)([_.]([0-9]+))?$} {
puts stderr "checking tag $matchInfo(line) => version $version"
}
scanmatch $git_context {_(.*[0-9]+[_.][0-9]+([_.][0-9]+)?)-([0-9]+)-g} {
scanmatch $git_context {_([0-9]+)_([0-9]+)(_([0-9]+))?$} {
set major $matchInfo(submatch0)
set minor $matchInfo(submatch1)
set patch [expr $matchInfo(submatch3) + 0]
set version $major.$minor.$patch
puts stderr "checking tag $matchInfo(line) => version $version"
}
scanmatch $git_context {(.*[0-9]+[_.][0-9]+([_.][0-9]+)?)-([0-9]+)-g} {
set version test
puts stderr "tag $matchInfo(submatch0) is $matchInfo(submatch2) commits old => version test"
}