]> git.madduck.net Git - code/vcsh.git/blobdiff - vcsh

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

Fix parsing of Git version numbers
[code/vcsh.git] / vcsh
diff --git a/vcsh b/vcsh
index d4e1ba0edc2d68be8bc63f115b8d64e79275c922..543a75e05ce25947492c83860e96f69f0c21de02 100755 (executable)
--- a/vcsh
+++ b/vcsh
@@ -162,7 +162,7 @@ clone() {
   You should add files to your new repository."
                exit
        fi
   You should add files to your new repository."
                exit
        fi
-       GIT_VERSION_MAJOR=$(git --version | sed -n 's/.* \([0-9]\)\..*/\1/p' )
+       GIT_VERSION_MAJOR=$(git --version | sed -n 's/.* \([0-9]\+\)\..*/\1/p' )
        if [ 1 -lt "$GIT_VERSION_MAJOR" ];then
                git fetch origin "$VCSH_BRANCH"
        else
        if [ 1 -lt "$GIT_VERSION_MAJOR" ];then
                git fetch origin "$VCSH_BRANCH"
        else
@@ -190,7 +190,7 @@ commit() {
                echo "$VCSH_REPO_NAME: "
                GIT_DIR=$VCSH_REPO_D/$VCSH_REPO_NAME.git; export GIT_DIR
                use
                echo "$VCSH_REPO_NAME: "
                GIT_DIR=$VCSH_REPO_D/$VCSH_REPO_NAME.git; export GIT_DIR
                use
-               git commit --untracked-files=no --quiet
+               git commit --untracked-files=no --quiet $@
                VCSH_COMMAND_RETURN_CODE=$?
                echo
        done
                VCSH_COMMAND_RETURN_CODE=$?
                echo
        done
@@ -476,9 +476,9 @@ write_gitignore() {
 
        use
        cd "$VCSH_BASE" || fatal "could not enter '$VCSH_BASE'" 11
 
        use
        cd "$VCSH_BASE" || fatal "could not enter '$VCSH_BASE'" 11
-       local GIT_VERSION=$(git --version)
-       local GIT_VERSION_MAJOR=$(echo $GIT_VERSION | sed -n 's/.* \([0-9]\)\..*/\1/p')
-       local GIT_VERSION_MINOR=$(echo $GIT_VERSION | sed -n 's/.* \([0-9]\)\.\([0-9]\)\..*/\2/p')
+       local GIT_VERSION="$(git --version)"
+       local GIT_VERSION_MAJOR=$(echo $GIT_VERSION | sed -n 's/.* \([0-9]\+\)\..*/\1/p')
+       local GIT_VERSION_MINOR=$(echo $GIT_VERSION | sed -n 's/.* \([0-9]\+\)\.\([0-9]\+\)\..*/\2/p')
        OLDIFS=$IFS
        IFS=$(printf '\n\t')
        gitignores=$(for file in $(git ls-files); do
        OLDIFS=$IFS
        IFS=$(printf '\n\t')
        gitignores=$(for file in $(git ls-files); do