X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Frev_control%2Fversion_control.sh;fp=scripts%2Frev_control%2Fversion_control.sh;h=7145416f66f9450ab0ad5223a9eee20ae7cfcae5;hb=130a17120755eef05b71014b7adf8f7c4def19fa;hp=84607308ff50b3ade5a2fff5b0e513ce310c655c;hpb=bea706608dd5b45782f21ab8642f48e4b7be28b1;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.