Merge branch 'dev' of feistymeow.org:feisty_meow into dev

diff --git a/scripts/rev_control/push_repo_downstream.sh b/scripts/rev_control/push_repo_downstream.sh
index 4e1530f8e29c280cde90c24dc98c695d31fd0344..910efd06d84437d57bdb6324ca567dad2d5c10b4 100644 (file)
--- a/scripts/rev_control/push_repo_downstream.sh
+++ b/scripts/rev_control/push_repo_downstream.sh
@@ -33,6 +33,9 @@
 source "$FEISTY_MEOW_SCRIPTS/core/launch_feisty_meow.sh"
 source "$FEISTY_MEOW_SCRIPTS/rev_control/version_control.sh"
 
+# turn off occasionally troublesome setting before checkin.
+unset GIT_SSH
+
 ##############
 
 dir="$1"; shift
@@ -42,31 +45,14 @@ fi
 
 pushd "$dir" &>/dev/null
 test_or_die "changing to directory: $dir"
+tempfile=$(generate_rev_ctrl_filelist)
+test_or_die "generating revision control file list"
+popd &>/dev/null
 
-#switch this to the perform revctrl with a do_git_careful_update
-
-
-
-# get everything from the origin.
-git fetch origin
-test_or_die "running git fetch origin"
-
-
-#these are all shots in the dark.
-# use our careful updater!
-
-git remote update
-
-# get everything from the origin.
-git fetch --all
-
-# merge the changes in.
-git merge --no-ff --all
-
-# turn off occasionally troublesome setting before checkin.
-unset GIT_SSH
+perform_revctrl_action_on_file "$tempfile" do_careful_git_update
+test_or_die "doing a careful git update on: $tempfile"
 
-# send the little boat down the stream to the dependent repository.
+# send our little boat down the stream to the dependent repository.
 git push downstream master
 test_or_die "running the git push downstream"
 

diff --git a/scripts/rev_control/version_control.sh b/scripts/rev_control/version_control.sh
index 1224480f3823fe27a3ec7c6a8e79ebbc689b707b..84607308ff50b3ade5a2fff5b0e513ce310c655c 100644 (file)
--- a/scripts/rev_control/version_control.sh
+++ b/scripts/rev_control/version_control.sh
@@ -283,9 +283,6 @@ 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"
@@ -303,7 +300,7 @@ function do_careful_git_update()
 #    echo "synchronizing remote branch: $bran"
     git checkout "$bran"
     test_or_die "git checking out remote branch: $bran"
-    git pull --no-ff
+    git pull --no-ff origin "$bran"
     test_or_die "git pull of remote branch: $bran"
   done
   # now switch back to our branch.