Skip to content

E
etersoft-build-utils
Commit abe0dd20 authored by Vitaly Lipatov's avatar Vitaly Lipatov
Browse files
Options

rpmgs: more strict git merge

parent 721befb7
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
bin/rpmgs
View file @ abe0dd20
...@@ -392,13 +392,13 @@ do ...@@ -392,13 +392,13 @@ do
#TODO check upstream #TODO check upstream
#TODO error if incompatible #TODO error if incompatible
docmd git remote add upstream $GETSOURCEGIT docmd git remote add upstream $GETSOURCEGIT
docmd git fetch upstream || fatal docmd git fetch --tags upstream || fatal
#TODO check tag: v%version or %version #TODO check tag: v%version or %version
[ -n "$GSSETVERSION" ] || fatal "Sorry, I don't know new version" [ -n "$GSSETVERSION" ] || fatal "Sorry, I don't know new version"
if [ "$GSSETVERSION" = "HEAD" ] ; then if [ "$GSSETVERSION" = "HEAD" ] ; then
docmd git merge upstream/master docmd git merge upstream/master
else else
docmd git merge v$GSSETVERSION || docmd git merge $GSSETVERSION docmd git merge v$GSSETVERSION || docmd git merge $GSSETVERSION || fatal
fi fi
# TODO: it is more clean detect that dir # 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