From: Chris Koeritz <fred@gruntose.com>
Date: Fri, 29 Dec 2017 16:15:09 +0000 (-0500)
Subject: stopped redundant merges, added reconfigure note
X-Git-Tag: 2.140.108~18
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;ds=sidebyside;h=aa527388b0a6ca2033396578749c201e4c2f7f61;p=feisty_meow.git

stopped redundant merges, added reconfigure note
---

diff --git a/scripts/rev_control/version_control.sh b/scripts/rev_control/version_control.sh
index d74fe1bd..e1cb4192 100644
--- a/scripts/rev_control/version_control.sh
+++ b/scripts/rev_control/version_control.sh
@@ -383,6 +383,10 @@ function do_careful_git_update()
   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"
diff --git a/scripts/site_avenger/revamp_cakelampvm.sh b/scripts/site_avenger/revamp_cakelampvm.sh
index 2717b3a6..9c83a588 100644
--- a/scripts/site_avenger/revamp_cakelampvm.sh
+++ b/scripts/site_avenger/revamp_cakelampvm.sh
@@ -285,6 +285,9 @@ echo "
 
 
 Thanks for revamping your cakelampvm.  :-)
+
+You may want to update your current shell's feisty meow environment by typing:
+  reconfigure_feisty_meow
 "
 
 ##############