arghsomeness

[feisty_meow.git] / scripts / rev_control / version_control.sh

diff --git a/scripts/rev_control/version_control.sh b/scripts/rev_control/version_control.sh
index c5ff3f02fd7c85df0569cea537a9248cdc8ec090..3c6685d67ad1fae3a2c4a4c500be88b9345e7338 100644 (file)
--- a/scripts/rev_control/version_control.sh
+++ b/scripts/rev_control/version_control.sh
@@ -77,6 +77,10 @@ function do_checkin()
   elif [ -d ".git" ]; then
     if test_writeable ".git"; then
       $blatt
+
+# classic implementation, but only works with one master branch.
+# fixes will be forthcoming from development branch.
+
       # snag all new files.  not to everyone's liking.
       git add --all .
       test_or_die "git add all new files"
@@ -87,6 +91,11 @@ function do_checkin()
         git commit .
         test_or_die "git commit"
       fi
+#      # upload the files to the server so others can see them.
+#      git push 2>&1 | grep -v "X11 forwarding request failed"
+#      if [ ${PIPESTATUS[0]} -ne 0 ]; then false; fi
+#      test_or_die "git push"
+
       # catch if the diff-index failed somehow.
       test_or_die "git diff-index"
 
@@ -272,32 +281,42 @@ function do_update()
     if test_writeable ".git"; then
       $blatt
 
-#let's start over clean here...
+# classic implementation, but only works with one master branch.
+# fixes will be forthcoming from development branch.
 
-      git fetch origin
-      test_or_die "git fetch origin"
+#      git pull 2>&1 | grep -v "X11 forwarding request failed" | $TO_SPLITTER
+#      if [ ${PIPESTATUS[0]} -ne 0 ]; then false; fi
+#      test_or_die "git pull"
+
+
+#let's start over clean here...
 
       git remote update
       test_or_die "git remote update"
 
 # from: https://stackoverflow.com/questions/3258243/check-if-pull-needed-in-git
-UPSTREAM="${1:-'@{u}'}"
+UPSTREAM=$(parent_branch_name)
+#argh: original 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
+if [ "$LOCAL" == "$REMOTE" ]; then
     echo "Up-to-date"
-elif [ $LOCAL = $BASE ]; then
+elif [ "$LOCAL" == "$BASE" ]; then
     echo "Need to pull"
-elif [ $REMOTE = $BASE ]; then
+elif [ "$REMOTE" == "$BASE" ]; then
     echo "Need to push"
 else
     echo "Diverged"
 fi
 
-echo The rest of pull is not done yet.
+echo The rest of pull is not being done yet.
+return 1
+
+      git pull --no-ff origin
+      test_or_die "git fetch origin"
 
 
 #      reslog=$(git log HEAD..origin/master --oneline)