Merge branch 'gitignore-none'

diff --combined doc/vcsh.1.ronn
index ee13b7f4005d5b34360fd14980a6606511eb0db1,7ebf9f5d77cccdaf82804f88c25ce73dd0f2c6cd..79a4063ebad86d1a0391afb471680a713bcd905b
--- 1/doc/vcsh.1.ronn
--- 2/doc/vcsh.1.ronn
+++ b/doc/vcsh.1.ronn
@@@ -1,5 -1,5 +1,5 @@@
 -vcsh(1) - manage config files in $HOME via fake bare git repositories
 -=====================================================================
 +vcsh(1) - Version Control System for $HOME - multiple Git repositories in $HOME
 +===============================================================================
  
  ## SYNOPSIS
  
@@@ -21,10 -21,6 +21,10 @@@
  
  `vcsh` list-tracked-by <repo>
  
 +`vcsh` pull
 +
 +`vcsh` push
 +
  `vcsh` rename <repo> <newname>
  
  `vcsh` run <repo> <shell command>
@@@ -49,7 -45,7 +49,7 @@@ working trees in $HOME without clobberi
  can have one repository per config set (zsh, vim, ssh, etc), picking and
  choosing which configs you want to use on which machine.
  
 -`vcsh` is using a technique called fake bare git repositories, keeping <$GIT_DIR>
 +`vcsh` is using a technique called fake bare Git repositories, keeping <$GIT_DIR>
  in a different directory from <$GIT_WORK_TREE> which is pointed to <$HOME>.
  
  The use of symlinks is not needed in this setup, making for a cleaner setup.
@@@ -102,12 -98,6 +102,12 @@@ an interactive user
  * list-tracked-by:
    List files tracked by a repository.
  
 +* pull:
 +  Pull from all vcsh remotes.
 +
 +* push:
 +  Push to all vcsh remotes.
 +
  * rename:
    Rename a repository.
  
@@@ -132,7 -122,7 +132,7 @@@
    Find <substring> in name of any tracked file.
  
  * write-gitignore:
 -  Write .gitignore.d/<repo> via git ls-files.
 +  Write .gitignore.d/<repo> via `git ls-files`.
  
  * <repo> <gitcommand>:
    Shortcut to run `vcsh` on a repo. Will prepend `git` to <command>.
@@@ -143,7 -133,7 +143,7 @@@
  ## ENVIRONMENT
  
  As noted earlier, `vcsh` will set <$GIT_DIR> and <$GIT_WORK_TREE> to the
 -appropriate values for fake bare git repositories.
 +appropriate values for fake bare Git repositories.
  
  ## CONFIG
  
@@@ -161,14 -151,16 +161,16 @@@ executed in the context of your shell
  Interesting knobs you can turn:
  
  * <$VCSH_GITIGNORE>:
-   Can be either <exact> or <recursive>.
+   Can be <exact>, <recursive>, or <none>.
  
-   <exact> will seed the repo-specific <.gitignore> with all file and directory
+   <exact> will seed the repo-specific ignore file with all file and directory
    names which `git ls-files` returns.
  
    <recursive> will descend through all directories recursively additionally to
    the above.
  
+   <none> will not write any ignore file.
+ 
    Defaults to <exact>.
  
  Less interesting knobs you could turn:
@@@ -256,7 -248,7 +258,7 @@@ resulting in unhappy end users
  Like most people, the author initially made do with a single repository for all
  config files, all of which were soft-linked into <$HOME>.
  
 -Martin F. Krafft aka madduck came up with the concept of fake bare git
 +Martin F. Krafft aka madduck came up with the concept of fake bare Git
  repositories.
  
  vcsh was initally written by madduck. This version is a re-implementation from
@@@ -269,7 -261,7 +271,7 @@@ This manpage and `vcsh` itself were wri
  
  ## COPYRIGHT
  
 -Copyright 2011-2012 Richard Hartmann <richih.mailinglist@gmail.com>
 +Copyright 2011-2013 Richard Hartmann <richih.mailinglist@gmail.com>
  
  Licensed under the GNU GPL version 2 or higher.
  

diff --combined vcsh
index e64ca0b936247983b4f203cd6f283f553070d322,b240b602e21a6e2d9f5920f62e9b2cf3e2cf80e5..175a9d1a39fcef377628deb224b9074d244efdbc
--- 1/vcsh
--- 2/vcsh
+++ b/vcsh
@@@ -24,7 -24,7 +24,7 @@@ basename() 
  }
  
  SELF=$(basename $0)
 -VERSION='1.2'
 +VERSION='1.20130614'
  
  fatal() {
        echo "$SELF: fatal: $1" >&2
@@@ -100,8 -100,6 +100,8 @@@ help() 
     list-tracked         List all files tracked by vcsh
     list-tracked-by \\
          <repo>          List files tracked by a repository
 +   pull                 Pull from all vcsh remotes
 +   push                 Push to vcsh remotes
     rename <repo> \\
            <newname>     Rename repository
     run <repo> \\
@@@ -133,7 -131,6 +133,7 @@@ info() 
  }
  
  clone() {
 +      hook pre-clone
        init
        git remote add origin "$GIT_REMOTE"
        git config branch.master.remote origin
@@@ -152,7 -149,6 +152,7 @@@
                fatal "will stop after fetching and not try to merge!
    Once this situation has been resolved, run 'vcsh run $VCSH_REPO_NAME git pull' to finish cloning.\n" 17
        git merge origin/master
 +      hook post-clone
  }
  
  delete() {
@@@ -224,28 -220,6 +224,28 @@@ list_tracked_by() 
        git ls-files | sort -u
  }
  
 +pull() {
 +      hook pre-pull
 +      for VCSH_REPO_NAME in $(list); do
 +              echo -n "$VCSH_REPO_NAME: "
 +              export GIT_DIR="$VCSH_REPO_D/$VCSH_REPO_NAME.git"
 +              use
 +              git pull
 +      done
 +      hook post-pull
 +}
 +
 +push() {
 +      hook pre-push
 +      for VCSH_REPO_NAME in $(list); do
 +              echo -n "$VCSH_REPO_NAME: "
 +              export GIT_DIR="$VCSH_REPO_D/$VCSH_REPO_NAME.git"
 +              use
 +              git push
 +      done
 +      hook post-push
 +}
 +
  rename() {
        git_dir_exists
        [ -d "$GIT_DIR_NEW" ] && fatal "'$GIT_DIR_NEW' exists" 54
@@@ -264,7 -238,7 +264,7 @@@ upgrade() 
        hook pre-upgrade
        use
        git config core.worktree     "$GIT_WORK_TREE"
-       git config core.excludesfile ".gitignore.d/$VCSH_REPO_NAME"
+       [ ! "x$VCSH_GITIGNORE" = 'xnone' ] && git config core.excludesfile ".gitignore.d/$VCSH_REPO_NAME"
        git config vcsh.vcsh         'true'
        [ -e "$VCSH_BASE/.gitignore.d/$VCSH_REPO_NAME" ] && git add -f "$VCSH_BASE/.gitignore.d/$VCSH_REPO_NAME"
        hook post-upgrade
@@@ -285,6 -259,12 +285,12 @@@ which() 
  }
  
  write_gitignore() {
+       # Don't do anything if the user does not want to write gitignore
+       if [ "x$VCSH_GITIGNORE" = 'xnone' ]; then
+               info "Not writing gitignore as '\$VCSH_GITIGNORE' is set to 'none'"
+               exit
+       fi
+ 
        use
        cd "$VCSH_BASE" || fatal "could not enter '$VCSH_BASE'" 11
        gitignores=$(for file in $(git ls-files); do
@@@ -298,7 -278,7 +304,7 @@@
        echo '*' > "$tempfile" || fatal "could not write to '$tempfile'" 57
        for gitignore in $gitignores; do
                echo "$gitignore" | sed 's@^@!/@' >> "$tempfile" || fatal "could not write to '$tempfile'" 57
-               if [ x$VCSH_GITIGNORE = x'recursive' ] && [ -d "$gitignore" ]; then
+               if [ "x$VCSH_GITIGNORE" = 'xrecursive' ] && [ -d "$gitignore" ]; then
                        { echo "$gitignore/*" | sed 's@^@!/@' >> "$tempfile" || fatal "could not write to '$tempfile'" 57; }
                fi
        done
@@@ -315,8 -295,8 +321,8 @@@
                fatal "could not move '$tempfile' to '$VCSH_BASE/.gitignore.d/$VCSH_REPO_NAME'" 53
  }
  
- if [ ! "x$VCSH_GITIGNORE" = 'xexact' ] && [ ! "x$VCSH_GITIGNORE" = 'xrecursive' ]; then
-       fatal "'\$VCSH_GITIGNORE' must be either 'exact' or 'recursive'" 1
+ if [ ! "x$VCSH_GITIGNORE" = 'xexact' ] && [ ! "x$VCSH_GITIGNORE" = 'xrecursive' ] && [ ! "x$VCSH_GITIGNORE" = 'xnone' ]; then
+       fatal "'\$VCSH_GITIGNORE' must equal 'exact', 'recursive', or 'none'" 1
  fi
  
  if [ "$1" = 'clone' ]; then
@@@ -344,17 -324,15 +350,17 @@@ elif [ "$1" = 'delete' ]           |
       [ "$1" = 'write-gitignore' ]; then
        [ -z $2 ]                      && fatal "$1: please specify repository to work on" 1
        [ "$1" = 'rename' -a -z "$3" ] && fatal "$1: please specify a target name" 1
 -      [ "$1" = 'run' -a -z "$3" ]    && fatal "$1: please specify a command" 1
 +      [ "$1" = 'run'    -a -z "$3" ] && fatal "$1: please specify a command" 1
        export VCSH_COMMAND="$1"
        export VCSH_REPO_NAME="$2"
        export GIT_DIR="$VCSH_REPO_D/$VCSH_REPO_NAME.git"
 -      [ "$VCSH_COMMAND" = 'rename' ]         && export GIT_DIR_NEW="$VCSH_REPO_D/$3.git"
 -      [ "$VCSH_COMMAND" = 'run' ] && shift 2
 +      [ "$VCSH_COMMAND" = 'rename' ] && export GIT_DIR_NEW="$VCSH_REPO_D/$3.git"
 +      [ "$VCSH_COMMAND" = 'run' ]    && shift 2
        [ "$VCSH_COMMAND" = 'write-gitignore' ]
  elif [ "$1" = 'list' ] ||
 -     [ "$1" = 'list-tracked' ]; then
 +     [ "$1" = 'list-tracked' ] ||
 +     [ "$1" = 'pull' ] ||
 +     [ "$1" = 'push' ]; then
        export VCSH_COMMAND="$1"
  elif [ -n "$2" ]; then
        export VCSH_COMMAND='run'
@@@ -380,9 -358,8 +386,8 @@@ if echo $VCSH_REPO_NAME | grep -q '/'; 
        export VCSH_REPO_NAME=$(basename "$VCSH_REPO_NAME" .git)
  fi
  
- 
- for check_directory in "$VCSH_REPO_D" "$VCSH_BASE/.gitignore.d"
- do
+ check_dir() {
+       check_directory="$1"
        if [ ! -d "$check_directory" ]; then
                if [ -e "$check_directory" ]; then
                        fatal "'$check_directory' exists but is not a directory" 13
@@@ -391,7 -368,10 +396,10 @@@
                        mkdir -p "$check_directory" || fatal "could not create '$check_directory'" 50
                fi
        fi
- done
+ }
+ 
+ check_dir "$VCSH_REPO_D"
+ [ ! "x$VCSH_GITIGNORE" = 'xnone' ] && check_dir "$VCSH_BASE/.gitignore.d"
  
  verbose "$VCSH_COMMAND begin"
  export VCSH_COMMAND=$(echo $VCSH_COMMAND | sed 's/-/_/g')