X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Frev_control%2Fpush_repo_downstream.sh;h=281cc7e9e8ea917a21b0ccd6cfc4d3bf85b0ac4b;hb=a96a113c134dfb31cebae4a1ac6db00a1d8af387;hp=485c1ede1ff9561cdd05a9a3e7d769ca73af6707;hpb=07235e55ae2cf9ceaeef43997794c726b9c4ee1c;p=feisty_meow.git diff --git a/scripts/rev_control/push_repo_downstream.sh b/scripts/rev_control/push_repo_downstream.sh index 485c1ede..281cc7e9 100644 --- a/scripts/rev_control/push_repo_downstream.sh +++ b/scripts/rev_control/push_repo_downstream.sh @@ -44,21 +44,21 @@ if [ -z "$dir" ]; then fi pushd "$dir" &>/dev/null -test_or_die "changing to directory: $dir" +exit_on_error "changing to directory: $dir" tempfile=$(generate_rev_ctrl_filelist) -test_or_die "generating revision control file list" +exit_on_error "generating revision control file list" perform_revctrl_action_on_file "$tempfile" do_careful_git_update -test_or_die "doing a careful git update on: $tempfile" +exit_on_error "doing a careful update on: $tempfile" # seems to be needed to cause a merge to be resolved. git pull downstream master # -m "unfortunate merge" -test_or_die "running the git pull downstream master" +exit_on_error "running the git pull downstream master" # send our little boat down the stream to the dependent repository. git push --tags downstream master -test_or_die "running the git push downstream master" +exit_on_error "running the git push downstream master" popd &>/dev/null