using multi-file and better named method

now using puff_out_list to expand git repositories with latest goodness, rather than the one trick pony of do_careful_git_update, which is a boring name.  need to verify that this is working still.

diff --git a/scripts/rev_control/push_repo_downstream.sh b/scripts/rev_control/push_repo_downstream.sh
index 485c1ede1ff9561cdd05a9a3e7d769ca73af6707..991a3251d99fa8d9a9226643f80390ea0d43b6b0 100644 (file)
--- a/scripts/rev_control/push_repo_downstream.sh
+++ b/scripts/rev_control/push_repo_downstream.sh
@@ -48,7 +48,8 @@ test_or_die "changing to directory: $dir"
 tempfile=$(generate_rev_ctrl_filelist)
 test_or_die "generating revision control file list"
 
-perform_revctrl_action_on_file "$tempfile" do_careful_git_update
+#perform_revctrl_action_on_file "$tempfile" do_careful_git_update
+perform_revctrl_action_on_file "$tempfile" puff_out_list
 test_or_die "doing a careful git update on: $tempfile"
 
 # seems to be needed to cause a merge to be resolved.

diff --git a/scripts/rev_control/rpuffer.sh b/scripts/rev_control/rpuffer.sh
index 5032bc12f1cbbcaf0e8aff4fd6fd91d047dc5541..c31fcb64ed350c3b569ba4585c1e28ce5635a890 100644 (file)
--- a/scripts/rev_control/rpuffer.sh
+++ b/scripts/rev_control/rpuffer.sh
@@ -24,6 +24,7 @@ tempfile=$(generate_rev_ctrl_filelist)
 test_or_die "generating revision control file list"
 popd &>/dev/null
 
-perform_revctrl_action_on_file "$tempfile" do_careful_git_update
+#perform_revctrl_action_on_file "$tempfile" do_careful_git_update
+perform_revctrl_action_on_file "$tempfile" puff_out_list
 test_or_die "puffing out repository at: $tempfile"
 

diff --git a/scripts/rev_control/version_control.sh b/scripts/rev_control/version_control.sh
index b96bcb3431fe55aa4f7bb478bc85e3300a08cd6b..355fd5e3352ea7a60a774c5f767d43deb2bd5d75 100644 (file)
--- a/scripts/rev_control/version_control.sh
+++ b/scripts/rev_control/version_control.sh
@@ -129,7 +129,7 @@ function do_checkin()
       fi
 
       # a new set of steps we have to take to make sure the branch integrity is good.
-      do_careful_git_update "$(\pwd)"
+      puff_out_list "$(\pwd)"
 
       # 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.