X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Frev_control%2Fversion_control.sh;h=1224480f3823fe27a3ec7c6a8e79ebbc689b707b;hb=9772e6f24294e4a5507a9fd64d6fdb8bb56f106f;hp=000c3c61b7903d2ea12403dc7dc0f74858fdf77e;hpb=e7032503c003871e7e2bb172e6b111710349eeba;p=feisty_meow.git

diff --git a/scripts/rev_control/version_control.sh b/scripts/rev_control/version_control.sh
index 000c3c61..1224480f 100644
--- a/scripts/rev_control/version_control.sh
+++ b/scripts/rev_control/version_control.sh
@@ -88,13 +88,13 @@ function do_checkin()
       fi
 
       # a new set of steps we have to take to make sure the branch integrity is good.
-      careful_git_update 
+      do_careful_git_update 
 
       # we continue on to the push, even if there were no changes this time, because
       # 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
@@ -219,11 +219,18 @@ function squash_first_few_crs()
   fi
 }
 
+#hmmm: the below are git specific and should be named that way.
+
+function all_branch_names()
+{
+  echo "$(git branch -vv | cut -d ' ' -f2)"
+}
+
 # a helpful method that reports the git branch for the current directory's
 # git repository.
 function my_branch_name()
 {
-  echo "$(git branch | grep '\*' | cut -d ' ' -f2)"
+  echo "$(git branch -vv | grep '\*' | cut -d ' ' -f2)"
 }
 
 #this had a -> in it at one point for not matching, didn't it?
@@ -272,21 +279,28 @@ 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
 # other methods.
-function careful_git_update()
+function do_careful_git_update()
 {
   local this_branch="$(my_branch_name)"
 
+#proposition: 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=$?
 #  test_or_continue "branch state check"
 #  echo the branch state is $state
 
-  # 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 '^\*')
+  # this code is now doing what i have to do when i repair the repo.  and it seems to be good so far.
+  local branch_list=$(all_branch_names)
   local bran
   for bran in $branch_list; do
-    echo "synchronizing remote branch: $bran"
+#    echo "synchronizing remote branch: $bran"
     git checkout "$bran"
     test_or_die "git checking out remote branch: $bran"
     git pull --no-ff
@@ -296,10 +310,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
@@ -336,7 +346,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
@@ -421,8 +431,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 .
@@ -431,6 +447,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