X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Frev_control%2Fversion_control.sh;h=d74fe1bd67c43c713249809e0bcbf0a991cb4b0a;hb=898abb2e5b0149d72a63b186196a04e8ad4c62c6;hp=6396a88af7218e864a532713d3c3db032b693bab;hpb=6271d07b36fa81d2c928febe24eccd0495396886;p=feisty_meow.git diff --git a/scripts/rev_control/version_control.sh b/scripts/rev_control/version_control.sh index 6396a88a..d74fe1bd 100644 --- a/scripts/rev_control/version_control.sh +++ b/scripts/rev_control/version_control.sh @@ -15,7 +15,7 @@ source "$FEISTY_MEOW_SCRIPTS/tty/terminal_titler.sh" export MAX_DEPTH=5 # use our splitter tool for lengthy output if it's available. -if [ ! -z "$(which splitter)" ]; then +if [ ! -z "$(which splitter 2>/dev/null)" ]; then TO_SPLITTER="$(which splitter)" # calculate the number of columsn in the terminal. cols=$(get_maxcols) @@ -64,7 +64,7 @@ function do_checkin() if [ $nicedir == "." ]; then nicedir=$(\pwd) fi - local blatt="echo checking in '$nicedir'..." + local blatt="echo -n checking in '$nicedir'... " do_update "$directory" test_or_die "repository update--this should be fixed before check-in." @@ -118,7 +118,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 origin "$(my_branch_name)" 2>&1 | grep -v "X11 forwarding request failed" | $TO_SPLITTER + git push --tags origin "$(my_branch_name)" 2>&1 | grep -v "X11 forwarding request failed" | $TO_SPLITTER promote_pipe_return 0 test_or_die "git push"