From 33c7032533563d9b7aed8e0a21ac3ab18dd44dcd Mon Sep 17 00:00:00 2001
From: Doug Coleman <doug.coleman@gmail.com>
Date: Mon, 21 Jan 2013 13:17:01 -0800
Subject: [PATCH] factor.sh: Allow bootstrap on other branches for commands
 that don't pull from git.

---
 build-support/factor.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/build-support/factor.sh b/build-support/factor.sh
index f4148c0d41..4c0fdc5af1 100755
--- a/build-support/factor.sh
+++ b/build-support/factor.sh
@@ -509,7 +509,6 @@ get_url() {
 
 get_config_info() {
     find_build_info
-    check_git_branch
     check_installed_programs
     check_libraries
 }
@@ -536,12 +535,13 @@ install() {
 
 update() {
     get_config_info
+    check_git_branch
     git_fetch_factorcode
     backup_factor
     make_clean_factor
 }
 
-update_bootstrap() {
+download_and_bootstrap() {
     update_boot_images
     bootstrap
 }
@@ -549,7 +549,7 @@ update_bootstrap() {
 net_bootstrap_no_pull() {
     get_config_info
     make_clean_factor
-    update_bootstrap
+    download_and_bootstrap
 }
 
 refresh_image() {
@@ -616,7 +616,7 @@ case "$1" in
     deps-macosx) install_deps_macosx ;;
     self-update) update; make_boot_image; bootstrap;;
     quick-update) update; refresh_image ;;
-    update) update; update_bootstrap ;;
+    update) update; download_and_bootstrap ;;
     bootstrap) get_config_info; bootstrap ;;
     net-bootstrap) net_bootstrap_no_pull ;;
     make-target) FIND_MAKE_TARGET=true; ECHO=false; find_build_info; exit_script ;;