dropping probably useless step

[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 c50ff7a85bd471d12c65f2c53dc28be74e27357e..f3f433d3eebd837eef27362e80cb98cf6460294b 100644 (file)
--- a/scripts/rev_control/version_control.sh
+++ b/scripts/rev_control/version_control.sh
@@ -9,8 +9,6 @@
 source "$FEISTY_MEOW_SCRIPTS/core/launch_feisty_meow.sh"
 source "$FEISTY_MEOW_SCRIPTS/tty/terminal_titler.sh"
 
-#hmmm: we need to dump all the outputs in this script into splitter
-
 ##############
 
 # the maximum depth that the recursive functions will try to go below the starting directory.
@@ -89,11 +87,6 @@ function do_checkin()
         test_or_die "git commit"
       fi
 
-#      # upload the files to the server so others can see them.
-#      git push 2>&1 | grep -v "X11 forwarding request failed"
-#      if [ ${PIPESTATUS[0]} -ne 0 ]; then false; fi
-#      test_or_die "git push"
-
       # a new set of steps we have to take to make sure the branch integrity is good.
       careful_git_update 
 
@@ -101,7 +94,7 @@ function do_checkin()
       # there could already be committed changes that haven't been pushed yet.
 
       # upload any changes to the upstream repo so others can see them.
-      git push 2>&1 | grep -v "X11 forwarding request failed" | $TO_SPLITTER
+      git push origin "$(my_branch_name)" 2>&1 | grep -v "X11 forwarding request failed" | $TO_SPLITTER
       test_or_die "git push"
 
     fi
@@ -278,26 +271,22 @@ sep
 
 # the git update process just gets more and more complex when you bring in
 # branches, so we've moved this here to avoid having a ton of code in the
-# do_checkin method.
+# other methods.
 function careful_git_update()
 {
-
   local this_branch="$(my_branch_name)"
 
-#we want my branch here, don't we?  not like parent or anything?
-  check_branch_state "$this_branch"
-  state=$?
-  test_or_continue "branch state check"
-  echo the branch state is $state
-#need to instead do something here if fails.
-# above is worse than useless code; in the situations i'm seeing fail, it reports no changes.  *&@#*&@#
+#appears to be useless; reports no changes when we need to know about remote changes that do exist:
+#  check_branch_state "$this_branch"
+#  state=$?
+#  test_or_continue "branch state check"
+#  echo the branch state is $state
 
-echo DOING BRANCH WALKER
   # the above are just not enough.  this code is now doing what i have to do when i repair the repo.
   local branch_list=$(git branch |grep -v '^\*')
   local bran
   for bran in $branch_list; do
-echo GETTING LATEST ON: $bran
+#    echo "synchronizing remote branch: $bran"
     git checkout "$bran"
     test_or_die "git checking out remote branch: $bran"
     git pull --no-ff
@@ -307,20 +296,15 @@ echo GETTING LATEST ON: $bran
   git checkout "$this_branch"
   test_or_die "git checking out our current branch: $this_branch"
 
-echo NOW REMOTE UPDATE
+#this step didn't help before, and it seems redundant now.
+#  # first update all our remote branches to their current state from the repos.
+#  git remote update
+#  test_or_die "git remote update"
 
-  # first update all our remote branches to their current state from the repos.
-  git remote update
-  test_or_die "git remote update"
-
-echo NOW THE FULL PULL
   # 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
   test_or_die "git pulling all upstream"
-
-echo DONE CAREFUL UPDATE
-
 }
 
 # gets the latest versions of the assets from the upstream repository.
@@ -353,7 +337,7 @@ function do_update()
   elif [ -d ".git" ]; then
     if test_writeable ".git"; then
       $blatt
-      git pull --no-ff origin 2>&1 | grep -v "X11 forwarding request failed" | $TO_SPLITTER
+      git pull --no-ff 2>&1 | grep -v "X11 forwarding request failed" | $TO_SPLITTER
       if [ ${PIPESTATUS[0]} -ne 0 ]; then false; fi
       test_or_die "git pull of origin without fast forwards"
     fi
@@ -438,8 +422,14 @@ function perform_revctrl_action_on_file()
 
   save_terminal_title
 
+  local did_anything=
+
   while read -u 3 dirname; do
-    if [ -z "$dirname" ]; then continue; fi
+    if [ -z "$dirname" ]; then
+      # we often have blank lines in the input file for some reason.
+      continue
+    fi
+    did_anything=yes
     pushd "$dirname" &>/dev/null
     echo "[$(pwd)]"
     $action .
@@ -448,6 +438,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