X-Git-Url: https://git.mxchange.org/?p=jprojects-scripts.git;a=blobdiff_plain;f=pull-stick.sh;h=c65578386902d47d67b24d42739b67b2674c6789;hp=a0bd4e9dc328812291792f1b098fc44cd92eb020;hb=81f5f37fb2db170b2bc97b2fc17029bc68361d2f;hpb=ea4b3dec8482c503ee8edeaaeac0b15209a07bb5 diff --git a/pull-stick.sh b/pull-stick.sh index a0bd4e9..c655783 100755 --- a/pull-stick.sh +++ b/pull-stick.sh @@ -15,20 +15,21 @@ for project in ${LIST}; do then echo "$0: Checkout '${project}' ..." git checkout -- . + elif [ "$1" = "r" ] + then + echo "$0: Resetting '${project}' ..." + git reset --hard fi - SKIP_TEST="${project:0:9}" - echo "$0: Pulling '${project}' ..." - if [ "${SKIP_TEST}" = "jratecalc" ] + + git pull -S origin master + git pull -S upstream master + git pull -S transport master + + if [ "$?" != "0" ] then git pull --all || exit 255 - else - git pull transport master - if [ "$?" != "0" ] - then - git pull --all || exit 255 - fi fi if [ "$1" != "s" ]