From: Chris Koeritz <fred@gruntose.com>
Date: Fri, 10 Nov 2017 16:15:28 +0000 (-0500)
Subject: arghsomeness
X-Git-Tag: 2.140.91^2~22
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=a0095cd01075664d4b692bd84203f319acb23d02;p=feisty_meow.git

arghsomeness
---

diff --git a/scripts/rev_control/version_control.sh b/scripts/rev_control/version_control.sh
index 718b602c..3c6685d6 100644
--- a/scripts/rev_control/version_control.sh
+++ b/scripts/rev_control/version_control.sh
@@ -294,10 +294,6 @@ function do_update()
       git remote update
       test_or_die "git remote update"
 
-      git pull origin
-#--no-ff 
-      test_or_die "git fetch origin"
-
 # from: https://stackoverflow.com/questions/3258243/check-if-pull-needed-in-git
 UPSTREAM=$(parent_branch_name)
 #argh: original UPSTREAM='${1:-'\''@{u}'\''}'
@@ -316,7 +312,11 @@ 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)