projects
/
feisty_meow.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'release-2.140.120' into dev
[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 485c1ede1ff9561cdd05a9a3e7d769ca73af6707..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"
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
@@
-44,21
+46,28
@@
if [ -z "$dir" ]; then
fi
pushd "$dir" &>/dev/null
fi
pushd "$dir" &>/dev/null
-
test_or_die
"changing to directory: $dir"
+
exit_on_error
"changing to directory: $dir"
tempfile=$(generate_rev_ctrl_filelist)
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_revctrl_careful_update
+exit_on_error "doing a careful update on: $tempfile"
-perform_revctrl_action_on_file "$tempfile" do_careful_git_update
-test_or_die "doing a careful git update on: $tempfile"
+rm "$tempfile"
# seems to be needed to cause a merge to be resolved.
git pull downstream master
# -m "unfortunate merge"
# 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 --tags downstream master
# send our little boat down the stream to the dependent repository.
git push --tags downstream master
-test_or_die "running the git push 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
popd &>/dev/null
+restore_terminal_title