X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Frev_control%2Fversion_control.sh;h=9b9704c286b0d82ad27c570636008e01ba91ea2d;hb=9ebc8de9b7f5697cacf71832a8a1ba291062fb66;hp=3016a77ce7e288081a6e9e1ae436d26100184a4f;hpb=d5eb622d41a49eb525e0df6639444945df9fd2ae;p=feisty_meow.git diff --git a/scripts/rev_control/version_control.sh b/scripts/rev_control/version_control.sh index 3016a77c..9b9704c2 100644 --- a/scripts/rev_control/version_control.sh +++ b/scripts/rev_control/version_control.sh @@ -90,7 +90,7 @@ function do_checkin() local blatt="echo -ne \nchecking in '$nicedir'... " do_update "$directory" - exit_on_error "repository update--this should be fixed before check-in." + exit_on_error "updating repository; this issue should be fixed before check-in." pushd "$directory" &>/dev/null if [ -f ".no-checkin" ]; then @@ -371,6 +371,7 @@ function do_careful_git_update() if [ ! -d ".git" ]; then # not a git project, so just boil this down to a getem action. popd &>/dev/null +echo "special case; not doing careful git update on non git repository: $directory" do_update "$directory" return $? fi @@ -438,7 +439,7 @@ function do_update() if [ $nicedir == "." ]; then nicedir=$(\pwd) fi - local blatt="echo retrieving '$nicedir'..." + local blatt="echo -e \nretrieving '$nicedir'..." pushd "$directory" &>/dev/null if [ -d "CVS" ]; then