Merge pull request #183 from ohspite/ff-initial-merge

vcsh: Always fast forward initial merge

diff --combined vcsh
index 9a5d5e04113dfd2bfaaa67cabf853e3c8276a6b8,4ea31258e840ff6f14c252c4237429b5ee7fc7d5..c30b12d15edcb4bbc2b1dda41b67d3b47c9c5174
--- 1/vcsh
--- 2/vcsh
+++ b/vcsh
@@@ -169,7 -169,7 +169,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 -264,7 +264,7 @@@ list_tracked_helper() 
  }
  
  list_tracked_by() {
 -      list_tracked $2
 +      list_tracked '' $2
  }
  
  list_untracked() {
@@@ -425,14 -425,12 +425,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() {