Merge remote-tracking branch 'madduck/relative_worktrees' into merge--madduck/relativ...

diff --combined vcsh
index 2ec49557b39b6d00d39d37eb70762d7fe5956538,5642b97741a4182f6ffdb0dacc3e15a4314ffa3e..60fcd99f17ee0b0d0ef5523567daf5a3cb34d1ed
--- 1/vcsh
--- 2/vcsh
+++ b/vcsh
@@@ -1,14 -1,14 +1,14 @@@
  #!/bin/sh
  
  # This program is licensed under the GNU GPL version 2 or later.
 -# (c) Richard "RichiH" Hartmann <richih.mailinglist@gmail.com>, 2011-2013
 +# (c) Richard "RichiH" Hartmann <richih@debian.org>, 2011-2013
  # For details, see LICENSE. To submit patches, you have to agree to
  # license your code under the GNU GPL version 2 or later.
  
  # While the following is not legally binding, the author would like to
  # explain the choice of GPLv2+ over GPLv3+.
  # The author prefers GPLv3+ over GPLv2+ but feels it's better to maintain
 -# full compatibility's with git. In case git ever changes its licensing terms,
 +# full compatibility's with Git. In case Git ever changes its licensing terms,
  # which is admittedly extremely unlikely to the point of being impossible,
  # this software will most likely follow suit.
  
@@@ -24,7 -24,7 +24,7 @@@ basename() 
  }
  
  SELF=$(basename $0)
 -VERSION='1.20130614'
 +VERSION='1.20130829'
  
  fatal() {
        echo "$SELF: fatal: $1" >&2
@@@ -38,11 -38,9 +38,11 @@@ while getopts "c:dv" flag; d
        if [ "$1" = '-d' ] || [ "$1" = '--debug' ]; then
                set -vx
                VCSH_DEBUG=1
 +              echo "debug mode on"
                echo "$SELF $VERSION"
        elif [ "$1" = '-v' ];then
                VCSH_VERBOSE=1
 +              echo "verbose mode on"
                echo "$SELF $VERSION"
        elif [ "$1" = '-c' ];then
                VCSH_OPTION_CONFIG=$OPTARG
@@@ -94,7 -92,6 +94,7 @@@ help() 
     commands:
     clone <remote> \\
           [<repo>]       Clone from an existing repository
 +   commit               Commit in all repositories
     delete <repo>        Delete an existing repository
     enter <repo>         Enter repository; spawn new instance of \$SHELL
     help                 Display this help text
@@@ -109,7 -106,6 +109,7 @@@
            <newname>     Rename repository
     run <repo> \\
         <command>        Use this repository
 +   status [<repo>]      Show statuses of all/one vcsh repositories
     upgrade <repo>       Upgrade repository to currently recommended settings
     version              Print version information
     which <substring>    Find substring in name of any tracked file
@@@ -161,18 -157,6 +161,18 @@@ clone() 
        hook post-clone-retired
  }
  
 +commit() {
 +      hook pre-commit
 +      for VCSH_REPO_NAME in $(list); do
 +              echo "$VCSH_REPO_NAME: "
 +              export GIT_DIR="$VCSH_REPO_D/$VCSH_REPO_NAME.git"
 +              use
 +              git commit --untracked-files=no --quiet
 +              echo
 +      done
 +      hook post-commit
 +}
 +
  delete() {
        cd "$VCSH_BASE" || fatal "could not enter '$VCSH_BASE'" 11
        use
@@@ -212,14 -196,11 +212,13 @@@ hook() 
  }
  
  init() {
 +      hook pre-init
        [ ! -e "$GIT_DIR" ] || fatal "'$GIT_DIR' exists" 10
-       export GIT_WORK_TREE="$VCSH_BASE"
-       mkdir -p "$GIT_WORK_TREE" || fatal "could not create '$GIT_WORK_TREE'" 50
-       cd "$GIT_WORK_TREE" || fatal "could not enter '$GIT_WORK_TREE'" 11
+       mkdir -p "$VCSH_BASE" || fatal "could not create '$VCSH_BASE'" 50
+       cd "$VCSH_BASE" || fatal "could not enter '$VCSH_BASE'" 11
        git init
        upgrade
 +      hook post-init
  }
  
  list() {
@@@ -251,7 -232,6 +250,7 @@@ pull() 
                export GIT_DIR="$VCSH_REPO_D/$VCSH_REPO_NAME.git"
                use
                git pull
 +              echo
        done
        hook post-pull
  }
@@@ -263,13 -243,11 +262,12 @@@ push() 
                export GIT_DIR="$VCSH_REPO_D/$VCSH_REPO_NAME.git"
                use
                git push
 +              echo
        done
        hook post-push
  }
  
  retire() {
-       unset GIT_WORK_TREE
        unset VCSH_DIRECTORY
  }
  
@@@ -293,35 -271,23 +291,39 @@@ run() 
        hook post-run
  }
  
 +status() {
 +      if [ ! "x$VCSH_REPO_NAME" = "x" ]; then
 +              export GIT_DIR="$VCSH_REPO_D/$VCSH_REPO_NAME.git"
 +              use
 +              git status --short --untracked-files='no'
 +      else
 +              for VCSH_REPO_NAME in $(list); do
 +                      echo "$VCSH_REPO_NAME:"
 +                      export GIT_DIR="$VCSH_REPO_D/$VCSH_REPO_NAME.git"
 +                      use
 +                      git status --short --untracked-files='no'
 +                      echo
 +              done
 +      fi
 +}
 +
  upgrade() {
        hook pre-upgrade
-       use
-       git config core.worktree     "$GIT_WORK_TREE"
+       # fake-bare repositories are not bare, actually. Set this to false
+       # because otherwise Git complains "fatal: core.bare and core.worktree
+       # do not make sense"
+       git config core.bare false
+       # in core.worktree, keep a relative reference to the base directory
+       git config core.worktree $(cd $GIT_DIR && GIT_WORK_TREE="$VCSH_BASE" git rev-parse --show-cdup)
        [ ! "x$VCSH_GITIGNORE" = 'xnone' ] && git config core.excludesfile ".gitignore.d/$VCSH_REPO_NAME"
        git config vcsh.vcsh         'true'
+       use
        [ -e "$VCSH_BASE/.gitignore.d/$VCSH_REPO_NAME" ] && git add -f "$VCSH_BASE/.gitignore.d/$VCSH_REPO_NAME"
        hook post-upgrade
  }
  
  use() {
        git_dir_exists
-       export GIT_WORK_TREE="$(git config --get core.worktree)"
        export VCSH_DIRECTORY="$VCSH_REPO_NAME"
  }
  
@@@ -370,8 -336,8 +372,8 @@@ write_gitignore() 
                fatal "could not move '$tempfile' to '$VCSH_BASE/.gitignore.d/$VCSH_REPO_NAME'" 53
  }
  
 -if [ ! "x$VCSH_GITIGNORE" = 'xexact' ] && [ ! "x$VCSH_GITIGNORE" = 'xrecursive' ] && [ ! "x$VCSH_GITIGNORE" = 'xnone' ]; then
 -      fatal "'\$VCSH_GITIGNORE' must equal 'exact', 'recursive', or 'none'" 1
 +if [ ! "x$VCSH_GITIGNORE" = 'xexact' ] && [ ! "x$VCSH_GITIGNORE" = 'xnone' ] && [ ! "x$VCSH_GITIGNORE" = 'xrecursive' ]; then
 +      fatal "'\$VCSH_GITIGNORE' must equal 'exact', 'none', or 'recursive'" 1
  fi
  
  if [ "$1" = 'clone' ]; then
@@@ -406,15 -372,11 +408,15 @@@ elif [ "$1" = 'delete' ]           |
        [ "$VCSH_COMMAND" = 'rename' ] && { export VCSH_REPO_NAME_NEW="$3";
                                            export GIT_DIR_NEW="$VCSH_REPO_D/$VCSH_REPO_NAME_NEW.git"; }
        [ "$VCSH_COMMAND" = 'run' ]    && shift 2
 -elif [ "$1" = 'list' ] ||
 +elif [ "$1" = 'commit' ] ||
 +     [ "$1" = 'list' ] ||
       [ "$1" = 'list-tracked' ] ||
       [ "$1" = 'pull' ] ||
       [ "$1" = 'push' ]; then
        export VCSH_COMMAND="$1"
 +elif [ "$1" = 'status' ]; then
 +      export VCSH_COMMAND="$1"
 +      export VCSH_REPO_NAME="$2"
  elif [ -n "$2" ]; then
        export VCSH_COMMAND='run'
        export VCSH_REPO_NAME="$1"
@@@ -445,7 -407,7 +447,7 @@@ check_dir() 
                if [ -e "$check_directory" ]; then
                        fatal "'$check_directory' exists but is not a directory" 13
                else
 -                      info "attempting to create '$check_directory'"
 +                      verbose "attempting to create '$check_directory'"
                        mkdir -p "$check_directory" || fatal "could not create '$check_directory'" 50
                fi
        fi