From db9d6e9c4a90a1475bf8113d4f7a04738facab68 Mon Sep 17 00:00:00 2001 From: "Fred T. Hamster" Date: Fri, 18 May 2018 14:57:50 -0400 Subject: [PATCH] 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. --- scripts/rev_control/push_repo_downstream.sh | 3 ++- scripts/rev_control/rpuffer.sh | 3 ++- scripts/rev_control/version_control.sh | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/scripts/rev_control/push_repo_downstream.sh b/scripts/rev_control/push_repo_downstream.sh index 485c1ede..991a3251 100644 --- 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 5032bc12..c31fcb64 100644 --- 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 b96bcb34..355fd5e3 100644 --- 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. -- 2.34.1