From 397455fd0894cfff7036d3d683f81eb359f634f3 Mon Sep 17 00:00:00 2001 From: Chris Koeritz Date: Thu, 9 Nov 2017 18:57:35 -0500 Subject: [PATCH] necessary addition of pushing to this branch was only doing a git push and not a git push origin mybranch. not sure which order the two should be in, but we'll find out. --- scripts/rev_control/version_control.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/scripts/rev_control/version_control.sh b/scripts/rev_control/version_control.sh index be183ae1..9f955d28 100644 --- a/scripts/rev_control/version_control.sh +++ b/scripts/rev_control/version_control.sh @@ -81,9 +81,16 @@ function do_checkin() # catch if the diff-index failed somehow. retval+=$? - # upload any changes to the upstream repo so others can see them. +#push the changes to where? locally? git push 2>&1 | grep -v "X11 forwarding request failed" | squash_first_few_crs retval+=${PIPESTATUS[0]} + + # upload any changes to the upstream repo so others can see them. + if [ "$(git_branch_name)" != "master" ]; then + git push origin "$(git_branch_name)" 2>&1 | grep -v "X11 forwarding request failed" | squash_first_few_crs + retval+=${PIPESTATUS[0]} + fi + fi else # nothing there. it's not an error though. -- 2.34.1