From: Chris Koeritz <fred@gruntose.com>
Date: Fri, 29 Dec 2017 16:17:43 +0000 (-0500)
Subject: unfixed the bad fix of ignoring current
X-Git-Tag: 2.140.108~17
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=a6717c076063772da7a05697254357a586fad650;p=feisty_meow.git

unfixed the bad fix of ignoring current

we do need to update even the same branch we start with, since its remote origin can have changes.
---

diff --git a/scripts/rev_control/version_control.sh b/scripts/rev_control/version_control.sh
index e1cb4192..b1035c53 100644
--- a/scripts/rev_control/version_control.sh
+++ b/scripts/rev_control/version_control.sh
@@ -379,14 +379,12 @@ function do_careful_git_update()
   show_branch_conditionally "$this_branch"
 
   # this code is now doing what i have to do when i repair the repo.  and it seems to be good so far.
+  # note that we allow the local branch to be merged with its remote counterpart; otherwise we would
+  # miss changes that happened elsewhere which should be seen in our local copy.
   local branch_list=$(all_branch_names)
   local bran
   for bran in $branch_list; do
 #    echo "synchronizing remote branch: $bran"
-    if [ "$this_branch" == "$bran" ]; then
-      echo "skipping redundant update on initial branch: $bran"
-      continue;
-    fi
     git checkout "$bran" | $TO_SPLITTER
     promote_pipe_return 0
     test_or_die "git switching checkout to remote branch: $bran"