X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=pull-stick.sh;h=edc6784f1e198a4a4a4eaa8251578c0eb6144c96;hb=10eace81387f9ad0afefe02545fb3d35ab7de89c;hp=a0bd4e9dc328812291792f1b098fc44cd92eb020;hpb=9445d791f3cef181208471b2bd8fc743e41037f6;p=jprojects-scripts.git diff --git a/pull-stick.sh b/pull-stick.sh index a0bd4e9..edc6784 100755 --- a/pull-stick.sh +++ b/pull-stick.sh @@ -17,18 +17,15 @@ for project in ${LIST}; do git checkout -- . 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" ]