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

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:

Merge pull request #233 from danielshahaf/bugfix/list-tracked-in-subdir-v1
authorRichard Hartmann <RichiH@users.noreply.github.com>
Mon, 28 Aug 2017 06:19:27 +0000 (08:19 +0200)
committerGitHub <noreply@github.com>
Mon, 28 Aug 2017 06:19:27 +0000 (08:19 +0200)
Fix: list-tracked in subdir would print invalid paths

1  2 
vcsh

diff --combined vcsh
index 6acf274093bcdb91ad351dc41dea2781dbf6e244,183eb179b8a2922913550b3436175b4b266c38e5..f06f5b456985dda6269b3541195b0e2c2c34fe6a
--- 1/vcsh
--- 2/vcsh
+++ b/vcsh
@@@ -22,9 -22,6 +22,9 @@@
  VERSION='1.20141026'
  SELF=$(basename $0)
  
 +# Ensure all files created are accessible only to the current user.
 +umask 0077
 +
  fatal() {
        echo "$SELF: fatal: $1" >&2
        [ -z $2 ] && exit 1
@@@ -109,7 -106,6 +109,7 @@@ help() 
     commit               Commit in all repositories
     delete <repo>        Delete an existing repository
     enter <repo>         Enter repository; spawn new instance of \$SHELL
 +                        with \$GIT_DIR set.
     foreach [<-g>]
       <git command>      Execute a command for every repository
     help                 Display this help text
@@@ -166,7 -162,7 +166,7 @@@ clone() 
    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
  
  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
 -              git commit --untracked-files=no --quiet $@
 +              git commit --untracked-files=no --quiet "$@"
                VCSH_COMMAND_RETURN_CODE=$?
                echo
        done
@@@ -266,7 -261,7 +266,7 @@@ init() 
        [ ! -e "$GIT_DIR" ] || fatal "'$GIT_DIR' exists" 10
        mkdir -p "$VCSH_BASE" || fatal "could not create '$VCSH_BASE'" 50
        cd "$VCSH_BASE" || fatal "could not enter '$VCSH_BASE'" 11
 -      git init --shared=0600
 +      git init --shared=false
        upgrade
        hook post-init
  }
@@@ -279,7 -274,7 +279,7 @@@ list() 
  
  get_files() {
        GIT_DIR=$VCSH_REPO_D/$VCSH_REPO_NAME.git; export GIT_DIR
-       git ls-files
+       git ls-files --full-name
  }
  
  list_tracked() {
@@@ -482,8 -477,8 +482,8 @@@ write_gitignore() 
        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