[ARVADOS-WORKBENCH2] updated: 2.1.0-397-g7a387fd8

[Git user]

Summary of changes:
 version-at-commit.sh | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

       via  7a387fd8937fd01637783a9a51ef1ac03d465158 (commit)
      from  646db814fcdff5e2267df848cee94f1128c760e7 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 7a387fd8937fd01637783a9a51ef1ac03d465158
Author: Peter Amstutz <peter.amstutz at curii.com>
Date:   Thu Jun 3 10:17:42 2021 -0400

    Update version-at-commit.sh refs #17512
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>

diff --git a/version-at-commit.sh b/version-at-commit.sh
index 84d7d0b4..53687daf 100755
--- a/version-at-commit.sh
+++ b/version-at-commit.sh
@@ -6,7 +6,7 @@
 set -e -o pipefail
 commit="$1"
 versionglob="[0-9].[0-9]*.[0-9]*"
-devsuffix=".dev"
+devsuffix="~dev"
 
 # automatically assign version
 #
@@ -38,10 +38,9 @@ else
 
     if git merge-base --is-ancestor "$nearest_tag" "$merge_base" ; then
         # x.(y+1).0.devTIMESTAMP, where x.y.z is the newest version that does not contain $commit
-        # grep reads the list of tags (-f) that contain $commit and filters them out (-v)
-        # this prevents a newer tag from retroactively changing the versions of everything before it
-        # We also filter out four-digit faux semantic versioning tags, they gum up the works.
-        v=$(git tag | grep -vFf <(git tag --contains "$commit") |grep -v -P '\d.\d.\d.\d' | sort -Vr | head -n1 | perl -pe 's/\.(\d+)\.\d+/".".($1+1).".0"/e')
+	# grep reads the list of tags (-f) that contain $commit and filters them out (-v)
+	# this prevents a newer tag from retroactively changing the versions of everything before it
+        v=$(git tag | grep -vFf <(git tag --contains "$commit") | sort -Vr | head -n1 | perl -pe 's/\.(\d+)\.\d+/".".($1+1).".0"/e')
     else
         # x.y.(z+1).devTIMESTAMP, where x.y.z is the latest released ancestor of $commit
         v=$(echo $nearest_tag | perl -pe 's/(\d+)$/$1+1/e')

-----------------------------------------------------------------------


hooks/post-receive
--