X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Frev_control%2Fversion_control.sh;fp=scripts%2Frev_control%2Fversion_control.sh;h=be77a2f6449ff5cfbc9b35bef2da0bc6cc4f071c;hb=b9709dc381635b605588629c3c8a4584263278d0;hp=34d51f284443e4140cd859b231070cc40c61a5a0;hpb=54d718f28e009067b353297e944053e9f7267586;p=feisty_meow.git diff --git a/scripts/rev_control/version_control.sh b/scripts/rev_control/version_control.sh index 34d51f28..be77a2f6 100644 --- a/scripts/rev_control/version_control.sh +++ b/scripts/rev_control/version_control.sh @@ -244,7 +244,7 @@ function all_branch_names() # git repository. function my_branch_name() { - echo "$(git branch -vv | grep '\*' | cut -d ' ' -f2)" + echo "$(git branch -vv | grep '^\*' | cut -d ' ' -f2)" } # reports the status of the branch by echoing one of these values: @@ -509,7 +509,7 @@ function generate_rev_ctrl_filelist() pushd "$dir" &>/dev/null local dirhere="$( \cd "$(\dirname "$dir")" && /bin/pwd )" local tempfile=$(mktemp /tmp/zz_checkins.XXXXXX) - echo >$tempfile + echo -n >$tempfile local additional_filter find $dirhere -follow -maxdepth $MAX_DEPTH -type d -iname ".svn" -exec echo {}/.. ';' >>$tempfile 2>/dev/null find $dirhere -follow -maxdepth $MAX_DEPTH -type d -iname ".git" -exec echo {}/.. ';' >>$tempfile 2>/dev/null