From b20c94130103f09fbe3580ac5b6e191fa9c54e4f Mon Sep 17 00:00:00 2001 From: Chris Koeritz Date: Fri, 10 Nov 2017 17:31:36 -0500 Subject: [PATCH] nearly fixed the downstream pushing --- scripts/rev_control/push_repo_downstream.sh | 2 +- scripts/rev_control/version_control.sh | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/scripts/rev_control/push_repo_downstream.sh b/scripts/rev_control/push_repo_downstream.sh index 910efd06..aacd7772 100644 --- a/scripts/rev_control/push_repo_downstream.sh +++ b/scripts/rev_control/push_repo_downstream.sh @@ -49,7 +49,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 "$(\pwd)" test_or_die "doing a careful git update on: $tempfile" # send our little boat down the stream to the dependent repository. diff --git a/scripts/rev_control/version_control.sh b/scripts/rev_control/version_control.sh index 9e314d2e..7dd199f4 100644 --- a/scripts/rev_control/version_control.sh +++ b/scripts/rev_control/version_control.sh @@ -88,7 +88,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 + do_careful_git_update "$(\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. @@ -449,7 +449,8 @@ function perform_revctrl_action_on_file() did_anything=yes pushd "$dirname" &>/dev/null echo "[$(pwd)]" - $action . + # pass the current directory plus the remaining parameters from function invocation. + $action . $* test_or_die "performing action $action on: $(pwd)" sep 28 popd &>/dev/null -- 2.34.1