Merge pull request #223 from madduck/fix-git-version-parsing

[code/vcsh.git] / vcsh

diff --git a/vcsh b/vcsh
index ce6705d979916ae84dcf759efc9881bc546231d9..7a63b2b514f919999dcb124f3999dbb830d5dbab 100755 (executable)
--- a/vcsh
+++ b/vcsh
@@ -166,7 +166,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


@@ -481,8 +481,8 @@ write_gitignore() {
        use
        cd "$VCSH_BASE" || fatal "could not enter '$VCSH_BASE'" 11
        local GIT_VERSION="$(git --version)"
        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_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