From: Chris Koeritz <fred@gruntose.com>
Date: Fri, 10 Nov 2017 00:59:49 +0000 (-0500)
Subject: so not quite grokked
X-Git-Tag: 2.140.90~2^2~12
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=d5a90e596c4f7637fdcf8c18de9a69509952d4aa;p=feisty_meow.git

so not quite grokked

there really is a chain going all the way back to master.  bummer.  however, i think you can get all of the pending updates from upstream with a pull --all.  trying that now.
---

diff --git a/scripts/rev_control/version_control.sh b/scripts/rev_control/version_control.sh
index ccb14c25..b5ad5170 100644
--- a/scripts/rev_control/version_control.sh
+++ b/scripts/rev_control/version_control.sh
@@ -264,16 +264,18 @@ function do_update()
     if test_writeable ".git"; then
       $blatt
       retval=0
-      local myself="$(my_branch_name)"
-      local parent="$(parent_branch_name)"
-
-      if [ "$myself" != "$parent" ]; then
-        git pull origin "$parent" 2>&1 | grep -v "X11 forwarding request failed" | squash_first_few_crs
+#      local myself="$(my_branch_name)"
+#      local parent="$(parent_branch_name)"
+#
+#      if [ "$myself" != "$parent" ]; then
+#        git pull origin "$parent" 2>&1 | grep -v "X11 forwarding request failed" | squash_first_few_crs
+#        retval+=${PIPESTATUS[0]}
+#      else
+
+        git pull --all 2>&1 | grep -v "X11 forwarding request failed" | squash_first_few_crs
         retval+=${PIPESTATUS[0]}
-      else
-        git pull 2>&1 | grep -v "X11 forwarding request failed" | squash_first_few_crs
-        retval+=${PIPESTATUS[0]}
-      fi
+
+#      fi
     fi
   else
     # this is not an error necessarily; we'll just pretend they planned this.