X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Frev_control%2Fpush_repo_downstream.sh;h=0135a40492310f3869d010babe785bd0329172af;hb=b4f6c54a3726553a6f0f6c2ba017d0195c01344d;hp=ef1bb35a6a49b553c992c08050e62da419afef70;hpb=e119f0f1cd5c6e64be0fa2c8739b999a591f48ee;p=feisty_meow.git diff --git a/scripts/rev_control/push_repo_downstream.sh b/scripts/rev_control/push_repo_downstream.sh index ef1bb35a..0135a404 100644 --- a/scripts/rev_control/push_repo_downstream.sh +++ b/scripts/rev_control/push_repo_downstream.sh @@ -33,6 +33,11 @@ source "$FEISTY_MEOW_SCRIPTS/core/launch_feisty_meow.sh" source "$FEISTY_MEOW_SCRIPTS/rev_control/version_control.sh" +save_terminal_title + +# turn off occasionally troublesome setting before checkin. +unset GIT_SSH + ############## dir="$1"; shift @@ -41,30 +46,28 @@ if [ -z "$dir" ]; then fi pushd "$dir" &>/dev/null -test_or_die "changing to directory: $dir" - -# get everything from the origin. -git fetch origin -test_or_die "running git fetch origin" +exit_on_error "changing to directory: $dir" +tempfile=$(generate_rev_ctrl_filelist) +exit_on_error "generating revision control file list" +perform_revctrl_action_on_file "$tempfile" do_revctrl_careful_update +exit_on_error "doing a careful update on: $tempfile" -#these are all shots in the dark. -# use our careful updater! +rm "$tempfile" -git remote update +# seems to be needed to cause a merge to be resolved. +git pull downstream main +# -m "unfortunate merge" +exit_on_error "running the git pull downstream main" -# get everything from the origin. -git fetch --all - -# merge the changes in. -git merge --no-ff --all - -# turn off occasionally troublesome setting before checkin. -unset GIT_SSH +# send our little boat down the stream to the dependent repository. +git push --tags downstream main +exit_on_error "running the git push downstream main" -# send the little boat down the stream to the dependent repository. -git push downstream master -test_or_die "running the git push downstream" +# do our dev branch also. +git push --tags downstream dev +continue_on_error "running the git push downstream dev: is there a dev branch?" popd &>/dev/null +restore_terminal_title