fixed this

[jprojects-scripts.git] / pull-stick.sh

diff --git a/pull-stick.sh b/pull-stick.sh
index f8b783453032570727ac67a0c70c9782df56af1e..4eeb02ea9180aa8aa1bc7bb72b6b14c170630c5d 100755 (executable)
--- a/pull-stick.sh
+++ b/pull-stick.sh
@@ -15,20 +15,31 @@ 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 || exit 255
+               git pull --all
        fi
 
-       echo "$0: Rebasing '${project}' ..."
-       git rebase origin/master || exit 255
+       echo "$0: Merging upstream into '${project}' ..."
+       git merge -S upstream/master
+
+       if [ "$1" != "s" ]
+       then
+               echo "$0: Rebasing '${project}' ..."
+               git rebase -Sm origin/master || exit 255
+       fi
 done
 
 echo "$0: All done."