Merge pull request #236 from lyda/git-version-bsd-fix

[code/vcsh.git] / vcsh

diff --git a/vcsh b/vcsh
index 7a63b2b514f919999dcb124f3999dbb830d5dbab..d1d26eddcc44809ae3cfa82c448e68bc23c2082d 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 -E -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,11 +190,12 @@ clone() {
 
 commit() {
        hook pre-commit
 
 commit() {
        hook pre-commit

+        shift  # remove the "commit" command.

        for VCSH_REPO_NAME in $(list); do
                echo "$VCSH_REPO_NAME: "
                GIT_DIR=$VCSH_REPO_D/$VCSH_REPO_NAME.git; export GIT_DIR
                use
        for VCSH_REPO_NAME in $(list); do
                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


@@ -278,7 +279,7 @@ list() {
 
 get_files() {
        GIT_DIR=$VCSH_REPO_D/$VCSH_REPO_NAME.git; export GIT_DIR
 
 get_files() {
        GIT_DIR=$VCSH_REPO_D/$VCSH_REPO_NAME.git; export GIT_DIR

-       git ls-files
+       git ls-files --full-name

 }
 
 list_tracked() {
 }
 
 list_tracked() {


@@ -481,8 +482,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 -E -n 's/.* ([0-9]+)\..*/\1/p')
+       local GIT_VERSION_MINOR=$(echo $GIT_VERSION | sed -E -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