Commit 643adfeb authored by Vitaly Lipatov's avatar Vitaly Lipatov

fix --force for git push

parent d9e86de9
...@@ -6,9 +6,16 @@ load_mod git ...@@ -6,9 +6,16 @@ load_mod git
test -r "$1" && fatal "Do not need any files in params" test -r "$1" && fatal "Do not need any files in params"
if is_girar_name $1 ; then
GIRARHOST=$1
OVERRIDEGIRARHOST=$1
shift
fi
if [ "$1" = "-h" ] ; then if [ "$1" = "-h" ] ; then
echo "gpush - publish current project repo remote git repo" echo "gpush - publish current project repo remote git repo"
echo "Use: gpush [-f|--force] [-a|--all] [-t|--tags] [GEAR] [target branch]" echo "Use: gpush [GIRAR] [-f|--force] [-a|--all] [-t|--tags] [target branch]"
exit 1 exit 1
fi fi
...@@ -32,12 +39,6 @@ fi ...@@ -32,12 +39,6 @@ fi
REMOTELIST="$(get_remote_git_list)" REMOTELIST="$(get_remote_git_list)"
if is_girar_name $1 ; then
GIRARHOST=$1
OVERRIDEGIRARHOST=$1
shift
fi
# disable use one target if it one # disable use one target if it one
if false && is_one_girar_name "$REMOTELIST" ; then if false && is_one_girar_name "$REMOTELIST" ; then
GIRARHOST="$REMOTELIST" GIRARHOST="$REMOTELIST"
......
...@@ -205,7 +205,7 @@ if [ -n "$UPLOADNOW" ] && is_gear $SPECDIR ; then ...@@ -205,7 +205,7 @@ if [ -n "$UPLOADNOW" ] && is_gear $SPECDIR ; then
pkg_release_check pkg_release_check
TAG=$VERSION-$RELEASE TAG=$VERSION-$RELEASE
check_gear_and_tag "$TAG" # || fatal "Can't make tag" check_gear_and_tag "$TAG" # || fatal "Can't make tag"
$ETERBUILDBIN/gpush $GIRARHOST "$TAG" || fatal "gpush failed. Possibly you need to run ginit for create remote repo. Try \$ gpush $GIRARHOST $TAG command separately" $ETERBUILDBIN/gpush $GIRARHOST $FORCE "$TAG" || fatal "gpush failed. Possibly you need to run ginit for create remote repo. Try \$ gpush $GIRARHOST $TAG command separately"
echo echo
echo "Run build $PROJECTNAME at $GIRARHOST" echo "Run build $PROJECTNAME at $GIRARHOST"
if [ -n "$TASKNUMBER" ] ; then if [ -n "$TASKNUMBER" ] ; then
......
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