X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Frev_control%2Fversion_control.sh;h=e1cb4192d4bcd8de812c39bf38e44bcb31fb8686;hb=23a54a83032f2102030c23ae98d34aea75bb4855;hp=75f344cf66ab8485f0e8b980f6b83c8eef924859;hpb=93b4d13ac6be1e3ef79a9070d2a234b0ae922144;p=feisty_meow.git diff --git a/scripts/rev_control/version_control.sh b/scripts/rev_control/version_control.sh index 75f344cf..e1cb4192 100644 --- a/scripts/rev_control/version_control.sh +++ b/scripts/rev_control/version_control.sh @@ -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." @@ -383,6 +383,10 @@ function do_careful_git_update() local bran for bran in $branch_list; do # echo "synchronizing remote branch: $bran" + if [ "$this_branch" == "$bran" ]; then + echo "skipping redundant update on initial branch: $bran" + continue; + fi git checkout "$bran" | $TO_SPLITTER promote_pipe_return 0 test_or_die "git switching checkout to remote branch: $bran"