X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Frev_control%2Fpush_repo_downstream.sh;h=f12fc74080918d53cf90175c7cdcbf38fc9fe010;hb=ea31dec826a360f97729000c351ea7e3e7aa9877;hp=281cc7e9e8ea917a21b0ccd6cfc4d3bf85b0ac4b;hpb=baf5d7c693e351bd775114380dc0111bc3e4028e;p=feisty_meow.git diff --git a/scripts/rev_control/push_repo_downstream.sh b/scripts/rev_control/push_repo_downstream.sh index 281cc7e9..f12fc740 100644 --- a/scripts/rev_control/push_repo_downstream.sh +++ b/scripts/rev_control/push_repo_downstream.sh @@ -33,6 +33,8 @@ 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 @@ -48,7 +50,7 @@ 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_careful_git_update +perform_revctrl_action_on_file "$tempfile" do_revctrl_careful_update exit_on_error "doing a careful update on: $tempfile" # seems to be needed to cause a merge to be resolved. @@ -60,5 +62,10 @@ exit_on_error "running the git pull downstream master" git push --tags downstream master exit_on_error "running the git push downstream master" +# 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