X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=scripts%2Frev_control%2Fversion_control.sh;h=7145416f66f9450ab0ad5223a9eee20ae7cfcae5;hb=54b61896e2d220b282a3ad77148aec5cd9484fcb;hp=84607308ff50b3ade5a2fff5b0e513ce310c655c;hpb=fc0c30c2b8ba564812510f0586b7edda8220b5ea;p=feisty_meow.git

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.