Skip to content

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

rpmbph: merge with master tag

parent 40718cb1
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 3 deletions
bin/rpmbph
View file @ 02f716f0
...@@ -108,6 +108,9 @@ if [ "$PKGVENDOR" = "alt" ] && is_gear $SPECDIR ; then ...@@ -108,6 +108,9 @@ if [ "$PKGVENDOR" = "alt" ] && is_gear $SPECDIR ; then
set_specdir $SPEC set_specdir $SPEC
docmd cd $SPECDIR || fatal docmd cd $SPECDIR || fatal
is_last_commit_tag || fatal "We allow backport only when last commit has (release) tag"
LASTTAG="$(get_last_tag)" || fatal "Can't get tag for last tag"
# set USEBRANCH # set USEBRANCH
set_usebranch set_usebranch
...@@ -132,9 +135,7 @@ if [ "$PKGVENDOR" = "alt" ] && is_gear $SPECDIR ; then ...@@ -132,9 +135,7 @@ if [ "$PKGVENDOR" = "alt" ] && is_gear $SPECDIR ; then
continue continue
fi fi
# TODO: check result message for merge? docmd git merge --no-ff $LASTTAG
# Use heads/ against warning: refname 'branch-name' is ambiguous
docmd git merge --no-ff heads/$CURBRANCH
# override spec conflicts # override spec conflicts
mv -f $BPSPEC $SPEC || fatal mv -f $BPSPEC $SPEC || fatal
......
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