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 9deee76670da9f4ef4619e4566904ac7168b8a83..6415cf1e7c232665b49ce87f797c98c5b3a60c87 100644 (file)
--- 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 84607308ff50b3ade5a2fff5b0e513ce310c655c..7145416f66f9450ab0ad5223a9eee20ae7cfcae5 100644 (file)
--- 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.