Commit 3c799bbe authored by Vitaly Lipatov's avatar Vitaly Lipatov

rpmgs: add support for v1-2-3 git tags

parent 8376dd87
......@@ -532,7 +532,9 @@ do
if [ "$GSSETVERSION" = "HEAD" ] ; then
docmd git merge upstream/master
else
docmd git merge v$GSSETVERSION || docmd git merge $GSSETVERSION || fatal
local alternate_tag1
alternate_tag1="$(echo "v$GSSETVERSION" | sed -e "s|\.|-|g")"
docmd git merge v$GSSETVERSION || docmd git merge $GSSETVERSION || docmd git merge $alternate_tag1 || fatal
fi
# TODO: it is more clean detect that dir
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment