X-Git-Url: https://feistymeow.org/gitweb/?p=feisty_meow.git;a=blobdiff_plain;f=scripts%2Frev_control%2Fversion_control.sh;h=4ea5ab5322a1ba7a0fa36ca35c611fa50886a1bd;hp=f33532de8ac96d71d19e2d03219efd8f8ec3e6f3;hb=3f11b26ebf3d7bf9fb4fb00813034eda0076f8c0;hpb=dd74823e9ff7b8b8cdfb709211f06d3e95bcdc83 diff --git a/scripts/rev_control/version_control.sh b/scripts/rev_control/version_control.sh index f33532de..4ea5ab53 100644 --- a/scripts/rev_control/version_control.sh +++ b/scripts/rev_control/version_control.sh @@ -94,7 +94,7 @@ function do_checkin() # there could already be committed changes that haven't been pushed yet. # upload any changes to the upstream repo so others can see them. - git push 2>&1 | grep -v "X11 forwarding request failed" | $TO_SPLITTER + git push origin "$(my_branch_name)" 2>&1 | grep -v "X11 forwarding request failed" | $TO_SPLITTER test_or_die "git push" fi @@ -336,7 +336,7 @@ function do_update() elif [ -d ".git" ]; then if test_writeable ".git"; then $blatt - git pull --no-ff origin 2>&1 | grep -v "X11 forwarding request failed" | $TO_SPLITTER + git pull --no-ff 2>&1 | grep -v "X11 forwarding request failed" | $TO_SPLITTER if [ ${PIPESTATUS[0]} -ne 0 ]; then false; fi test_or_die "git pull of origin without fast forwards" fi