Commit fffbd61c authored by Vitaly Lipatov's avatar Vitaly Lipatov

rpmgs: check if we have no tag name to merge

parent 4aaa58df
...@@ -552,7 +552,7 @@ do ...@@ -552,7 +552,7 @@ do
done done
if [ "$rc" = "1" ] ; then if [ "$rc" = "1" ] ; then
i="$(git tag | grep "$GSSETVERSION\$")" i="$(git tag | grep "$GSSETVERSION\$")"
git rev-parse $i >/dev/null 2>/dev/null && docmd git merge $i && rc=0 [ -n "$i" ] && git rev-parse $i >/dev/null 2>/dev/null && docmd git merge $i && rc=0
fi fi
[ "$rc" = "0" ] || fatal "Can't find tag for $GSSETVERSION version" [ "$rc" = "0" ] || fatal "Can't find tag for $GSSETVERSION version"
fi fi
......
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