Merge branch 'feature/opt-list_untracked-a'

diff --combined vcsh
index c30b12d15edcb4bbc2b1dda41b67d3b47c9c5174,4da3547da71727fd0085e2f2004c437c44003a34..afed6eb33abbcc16885365cd560095a3eeb94a9d
--- 1/vcsh
--- 2/vcsh
+++ b/vcsh
@@@ -112,7 -112,8 +112,8 @@@ help() 
     list-tracked \\
          [<repo>]        List all files tracked all or one repositories
     list-untracked \\
-         [<-r>] [<repo>] List all files not tracked by all or one repositories
+         [<-a>] [<-r>]
+         [<repo>]        List all files not tracked by all or one repositories
     pull                 Pull from all vcsh remotes
     push                 Push to vcsh remotes
     rename <repo> \\
@@@ -169,7 -170,7 +170,7 @@@ clone() 
        [ x"$VCSH_CONFLICT" = x'1' ]) &&
                fatal "will stop after fetching and not try to merge!
    Once this situation has been resolved, run 'vcsh $VCSH_REPO_NAME pull' to finish cloning." 17
 -      git merge origin/"$VCSH_BRANCH"
 +      git -c merge.ff=true merge origin/"$VCSH_BRANCH"
        hook post-merge
        hook post-clone
        retire
@@@ -264,7 -265,7 +265,7 @@@ list_tracked_helper() 
  }
  
  list_tracked_by() {
 -      list_tracked $2
 +      list_tracked '' $2
  }
  
  list_untracked() {
@@@ -275,10 -276,13 +276,13 @@@
        temp_file_untracked_copy=$(mktemp "${TMPDIR:-/tmp}/tmp.XXXXXXXXXX") || fatal 'Could not create temp file'
  
        # Hack in support for `vcsh list-untracked -r`...
+       exclude_standard_opt='--exclude-standard'
        directory_opt="--directory"
        shift 1
-       while getopts "r" flag; do
-               if [ x"$1" = x'-r' ]; then
+       while getopts "ar" flag; do
+               if [ x"$1" = x'-a' ]; then
+                       unset exclude_standard_opt
+               elif [ x"$1" = x'-r' ]; then
                        unset directory_opt
                fi
                shift 1
@@@ -301,7 -305,7 +305,7 @@@
  
  list_untracked_helper() {
        export GIT_DIR="$VCSH_REPO_D/$VCSH_REPO_NAME.git"
-       git ls-files --others "$directory_opt" | (
+       git ls-files --others $exclude_standard_opt "$directory_opt" | (
                while read line; do
                        echo "$line"
                        directory_component=${line%%/*}
@@@ -425,14 -429,12 +429,14 @@@ use() 
  }
  
  which() {
 -      [ -e "$VCSH_COMMAND_PARAMETER" ] || fatal "'$VCSH_COMMAND_PARAMETER' does not exist" 1
 -      for VCSH_REPO_NAME in $(list); do
 -              for VCSH_FILE in $(get_files); do
 -                      echo "$VCSH_FILE" | grep -q "$VCSH_COMMAND_PARAMETER" && echo "$VCSH_REPO_NAME: $VCSH_FILE"
 -              done
 -      done | sort -u
 +      output=$(for VCSH_REPO_NAME in $(list); do
 +              get_files | grep -- "$VCSH_COMMAND_PARAMETER" | sed "s/^/$VCSH_REPO_NAME: /"
 +      done | sort -u)
 +      if [ -z "$output" ]; then
 +              fatal "'$VCSH_COMMAND_PARAMETER' does not exist" 1
 +      else
 +              echo "$output"
 +      fi
  }
  
  write_gitignore() {