X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Frev_control%2Fversion_control.sh;h=432d32636c4bfb3de14efddd4f4184a5ec6fe87c;hb=d84cca001d859500e4273888332fea8ed9943f51;hp=b6ab0217f6f3c7f1001723841c27e4e0cbad9417;hpb=366ada5b8fb59769ababfd39a68e3b51d46cf2d8;p=feisty_meow.git diff --git a/scripts/rev_control/version_control.sh b/scripts/rev_control/version_control.sh index b6ab0217..432d3263 100644 --- a/scripts/rev_control/version_control.sh +++ b/scripts/rev_control/version_control.sh @@ -112,7 +112,7 @@ function do_checkin() return 1 fi pushd "$directory" &>/dev/null - retval=0 # normally successful. + local retval=0 # normally successful. if [ -d "CVS" ]; then cvs ci . retval=$? @@ -141,7 +141,7 @@ function do_diff { local directory="$1"; shift pushd "$directory" &>/dev/null - retval=0 # normally successful. + local retval=0 # normally successful. # only update if we see a repository living there. if [ -d ".svn" ]; then @@ -160,12 +160,16 @@ function do_report_new { local directory="$1"; shift pushd "$directory" &>/dev/null - retval=0 # normally successful. + local retval=0 # normally successful. # only update if we see a repository living there. if [ -d ".svn" ]; then # this action so far only makes sense and is needed for svn. bash $FEISTY_MEOW_SCRIPTS/rev_control/svnapply.sh \? echo + retval=$? + elif [ -d ".git" ]; then + git status -u + retval=$? fi popd &>/dev/null @@ -211,8 +215,7 @@ function squash_first_few_crs() function do_update() { directory="$1"; shift - # plan on success for now. - retval=0 + local retval=0 # plan on success for now. pushd "$directory" &>/dev/null if [ -d "CVS" ]; then cvs update . | squash_first_few_crs