projects
/
feisty_meow.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dos2unix added properly in prep feisty
[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..0135a40492310f3869d010babe785bd0329172af 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"
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
# turn off occasionally troublesome setting before checkin.
unset GIT_SSH
@@
-48,17
+50,24
@@
exit_on_error "changing to directory: $dir"
tempfile=$(generate_rev_ctrl_filelist)
exit_on_error "generating revision control file list"
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"
exit_on_error "doing a careful update on: $tempfile"
+rm "$tempfile"
+
# seems to be needed to cause a merge to be resolved.
# seems to be needed to cause a merge to be resolved.
-git pull downstream ma
ster
+git pull downstream ma
in
# -m "unfortunate merge"
# -m "unfortunate merge"
-exit_on_error "running the git pull downstream ma
ster
"
+exit_on_error "running the git pull downstream ma
in
"
# send our little boat down the stream to the dependent repository.
# send our little boat down the stream to the dependent repository.
-git push --tags downstream master
-exit_on_error "running the git push downstream master"
+git push --tags downstream main
+exit_on_error "running the git push downstream main"
+
+# 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
popd &>/dev/null
+restore_terminal_title