Fix: list-tracked in subdir would print invalid paths

[code/vcsh.git] / vcsh

diff --git a/vcsh b/vcsh
index f9bea25db43dca013dc9e43a4619b547f76a5b80..183eb179b8a2922913550b3436175b4b266c38e5 100755 (executable)
--- a/vcsh
+++ b/vcsh
@@ -274,7 +274,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() {


@@ -476,7 +476,7 @@ 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="$(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
        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