added removal of temp file with sorted file list

[feisty_meow.git] / scripts / rev_control / push_repo_downstream.sh

diff --git a/scripts/rev_control/push_repo_downstream.sh b/scripts/rev_control/push_repo_downstream.sh
index 281cc7e9e8ea917a21b0ccd6cfc4d3bf85b0ac4b..1fc6e0ba904d351ee99218237f47fc9218c989d4 100644 (file)
--- 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,9 +50,11 @@ 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"
 
+rm "$tempfile"
+
 # seems to be needed to cause a merge to be resolved.
 git pull downstream master
 # -m "unfortunate merge"
@@ -60,5 +64,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