vcsh: Default to not using ~/.gitattributes.d

[code/vcsh.git] / _vcsh

diff --git a/_vcsh b/_vcsh
index 26ee9b9e55e74c146b615b4809133042409dd1f3..47dbd9e69a9582540c563cfc27c0362fc046d453 100644 (file)
--- a/_vcsh
+++ b/_vcsh
@@ -43,6 +43,14 @@ function _vcsh-list-tracked-by () {
        (( CURRENT == 2 )) && __vcsh_repositories
 }
 
+function _vcsh-pull () {
+       _nothing
+}
+
+function _vcsh-push () {
+       _nothing
+}
+
 function _vcsh-rename () {
        (( CURRENT == 2 )) && __vcsh_repositories
        (( CURRENT == 3 )) && _message "new repository name"
@@ -58,7 +66,7 @@ function _vcsh-run () {
        fi
 }
 
-function _vcsh-setup () {
+function _vcsh-upgrade () {
        (( CURRENT == 2 )) && __vcsh_repositories
 }
 
@@ -88,9 +96,10 @@ function _vcsh () {
                "list:list all local vcsh repositories"
                "list-tracked:list all files tracked by vcsh"
                "list-tracked-by:list files tracked by a repository"
+               "pull:pull from all vcsh remotes"
                "rename:rename a repository"
                "run:run command with <\$GIT_DIR> and <\$GIT_WORK_TREE> set"
-               "setup:set up repository with recommended settings"
+               "upgrade:upgrade repository to currently recommended settings"
                "version:print version information"
                "which:find <substring> in name of any tracked file"
                "write-gitignore:write .gitignore.d/<repo> via git ls-files"
@@ -114,8 +123,7 @@ function _vcsh () {
                        if ! (( ${+functions[_vcsh-$vcshcommand]} )); then
                                # There is no handler function, so this is probably the name
                                # of a repository. Act accordingly.
-                               _message "git sub-command"
-                               #TODO and now we need to complete on git subcommands
+                               _dispatch git git
                        else
                                curcontext="${curcontext%:*:*}:vcsh-${vcshcommand}:"
                                _call_function ret _vcsh-${vcshcommand}