- # from very helpful page:
- # https://stackoverflow.com/questions/10312521/how-to-fetch-all-git-branches
- for remote in $( git branch -r | grep -v -- '->' ); do
- git branch --track ${remote#origin/} $remote 2>/dev/null
-#hmmm: ignoring errors from these, since they are continual.
-#hmmm: if we could find a way to not try to track with a local branch when there's already one present, that would be swell. it's probably simple.
- done
+#let's start over clean here...
+
+ git fetch origin
+ test_or_die "git fetch origin"
+
+ git remote update
+ test_or_die "git remote update"
+
+# from: https://stackoverflow.com/questions/3258243/check-if-pull-needed-in-git
+UPSTREAM="${1:-'@{u}'}"
+LOCAL=$(git rev-parse @)
+REMOTE=$(git rev-parse "$UPSTREAM")
+BASE=$(git merge-base @ "$UPSTREAM")
+var UPSTREAM LOCAL REMOTE BASE
+
+if [ $LOCAL = $REMOTE ]; then
+ echo "Up-to-date"
+elif [ $LOCAL = $BASE ]; then
+ echo "Need to pull"
+elif [ $REMOTE = $BASE ]; then
+ echo "Need to push"
+else
+ echo "Diverged"
+fi
+
+echo The rest of pull is not done yet.
+
+
+# reslog=$(git log HEAD..origin/master --oneline)
+# if [[ "${reslog}" != "" ]] ; then
+# git merge origin/master
+