X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Frev_control%2Fpush_repo_downstream.sh;h=281cc7e9e8ea917a21b0ccd6cfc4d3bf85b0ac4b;hb=a96a113c134dfb31cebae4a1ac6db00a1d8af387;hp=b9c0620324b7b39947d98e999ad5f10698454187;hpb=c465170cd5ab33ee2f961472218cc2af40d469cb;p=feisty_meow.git diff --git a/scripts/rev_control/push_repo_downstream.sh b/scripts/rev_control/push_repo_downstream.sh index b9c06203..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 downstream master -test_or_die "running the git push downstream master" +git push --tags downstream master +exit_on_error "running the git push downstream master" popd &>/dev/null