From 1e4dd772342ca265b5d7202341052968cd437f82 Mon Sep 17 00:00:00 2001 From: Chris Koeritz Date: Sat, 11 Nov 2017 17:58:54 +0000 Subject: [PATCH] fixes problems in push repo downstream --- scripts/rev_control/push_repo_downstream.sh | 3 +-- scripts/rev_control/version_control.sh | 3 ++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/rev_control/push_repo_downstream.sh b/scripts/rev_control/push_repo_downstream.sh index aacd7772..b2da8870 100644 --- a/scripts/rev_control/push_repo_downstream.sh +++ b/scripts/rev_control/push_repo_downstream.sh @@ -47,9 +47,8 @@ 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 -perform_revctrl_action_on_file "$tempfile" do_careful_git_update "$(\pwd)" +perform_revctrl_action_on_file "$tempfile" do_careful_git_update 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 7dd199f4..de819f37 100644 --- a/scripts/rev_control/version_control.sh +++ b/scripts/rev_control/version_control.sh @@ -450,7 +450,8 @@ function perform_revctrl_action_on_file() pushd "$dirname" &>/dev/null echo "[$(pwd)]" # pass the current directory plus the remaining parameters from function invocation. - $action . $* + $action . +#$* test_or_die "performing action $action on: $(pwd)" sep 28 popd &>/dev/null -- 2.34.1