another try at the totally right steps

[feisty_meow.git] / scripts / rev_control / version_control.sh

diff --git a/scripts/rev_control/version_control.sh b/scripts/rev_control/version_control.sh
index 2e2214913c8055977b6dc86dcc7e2aea514fdb7f..efda594872aec436582caedc33719782f0af0520 100644 (file)
--- a/scripts/rev_control/version_control.sh
+++ b/scripts/rev_control/version_control.sh
@@ -276,6 +276,12 @@ function careful_git_update()
 {
   local this_branch="$(my_branch_name)"
 
+#this step didn't help before, and it seems redundant now.
+#hmmm, maybe it is needed.  and people did seem to want it first, so trying that.
+  # first update all our remote branches to their current state from the repos.
+  git remote update
+  test_or_die "git remote update"
+
 #appears to be useless; reports no changes when we need to know about remote changes that do exist:
 #  check_branch_state "$this_branch"
 #  state=$?
@@ -296,10 +302,6 @@ function careful_git_update()
   git checkout "$this_branch"
   test_or_die "git checking out our current branch: $this_branch"
 
-  # first update all our remote branches to their current state from the repos.
-  git remote update
-  test_or_die "git remote update"
-
   # now pull down any changes in our own origin in the repo, to stay in synch
   # with any changes from others.
   git pull --no-ff --all
@@ -421,16 +423,14 @@ function perform_revctrl_action_on_file()
 
   save_terminal_title
 
-  local first_run=true
+  local did_anything=
 
   while read -u 3 dirname; do
     if [ -z "$dirname" ]; then
-      if [ ! -z "$first_run" ]; then
-        echo "There was nothing to do the action '$action' on."
-      fi
-      break
+      # we often have blank lines in the input file for some reason.
+      continue
     fi
-    unset first_run
+    did_anything=yes
     pushd "$dirname" &>/dev/null
     echo "[$(pwd)]"
     $action .
@@ -439,6 +439,10 @@ function perform_revctrl_action_on_file()
     popd &>/dev/null
   done 3<"$tempfile"
 
+  if [ -z "$did_anything" ]; then
+    echo "There was nothing to do the action '$action' on."
+  fi
+
   restore_terminal_title
 
   rm $tempfile