From: Chris Koeritz <fred@gruntose.com>
Date: Fri, 10 Nov 2017 21:10:06 +0000 (-0500)
Subject: Merge branch 'release-2.140.92' into dev
X-Git-Tag: 2.140.92^2~4^2
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=54b61896e2d220b282a3ad77148aec5cd9484fcb;hp=afff950f497547f99b9df6287c6227868b5cfa3f;p=feisty_meow.git

Merge branch 'release-2.140.92' into dev

getting fixes from release branch into dev branch
---

diff --git a/production/feisty_meow_config.ini b/production/feisty_meow_config.ini
index 9deee766..6415cf1e 100644
--- a/production/feisty_meow_config.ini
+++ b/production/feisty_meow_config.ini
@@ -3,7 +3,7 @@
 # specifies the version of the code that is being constructed here.
 major=2
 minor=140
-revision=91
+revision=92
 build=420
 
 # specifies the remainder of the version record info.
diff --git a/scripts/rev_control/version_control.sh b/scripts/rev_control/version_control.sh
index 84607308..7145416f 100644
--- a/scripts/rev_control/version_control.sh
+++ b/scripts/rev_control/version_control.sh
@@ -299,8 +299,12 @@ function do_careful_git_update()
   for bran in $branch_list; do
 #    echo "synchronizing remote branch: $bran"
     git checkout "$bran"
-    test_or_die "git checking out remote branch: $bran"
-    git pull --no-ff origin "$bran"
+    test_or_die "git switching checkout to remote branch: $bran"
+    remote_branch_info=$(git ls-remote --heads origin $bran 2>/dev/null)
+    if [ ! -z "$remote_branch_info" ]; then
+      # we are pretty sure the remote branch does exist.
+      git pull --no-ff origin "$bran"
+    fi
     test_or_die "git pull of remote branch: $bran"
   done
   # now switch back to our branch.