stopped redundant merges, added reconfigure note

[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 d74fe1bd67c43c713249809e0bcbf0a991cb4b0a..e1cb4192d4bcd8de812c39bf38e44bcb31fb8686 100644 (file)
--- 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"