_git and partial completion, again

[Bart Schaefer <schaefer@brasslantern.com>]

On Jan 24, 10:00am, Nikolai Weibull wrote:
}
} > We've already seen the "do it externally" plan break down with the _git
} > issue discussed in the thread leading up to zsh-users/18321 (about which
} > we're sort of awaiting your input, Nikolai).
} 
} Uh, I've totally missed this.  I guess a zstyle would work, but
} couldn't one check if completion is being done by partial-path?

I can't think of a good way to distinguish a partial completion from a full
completion of a path that exists only on the remote repo.

Someone suggested that we simply avoid calling __git_files in some cases,
but I don't know git details well enough to make that determination.

So, my best guess is below, which just calls ls-files more than once.
There are probably cases where it could do better; e.g., for modified
files it cbuld first glob $pref* locally and, if anything matches, use
ls-files to filter for only the modified subset.  However, that wouldn't
be appropriate for deleted files, so this may be the best we can do
without some kind of a switch on $opts.


diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git
index 43a01d9..c09f255 100644
--- a/Completion/Unix/Command/_git
+++ b/Completion/Unix/Command/_git
@@ -5683,9 +5683,17 @@ __git_files () {
   # TODO: --directory should probably be added to $opts when --others is given.
 
   local pref=$gitcdup$gitprefix$PREFIX
+
+  # First allow ls-files to pattern-match in case of remote repository
   files=(${(0)"$(_call_program files git ls-files -z --exclude-standard $opts -- ${pref:+$pref\\\*} 2>/dev/null)"})
   __git_command_successful $pipestatus || return
 
+  # If ls-files succeeded but returned nothing, try again with no pattern
+  if [[ -z "$files" && -n "$pref" ]]; then
+    files=(${(0)"$(_call_program files git ls-files -z --exclude-standard $opts -- 2>/dev/null)"})
+    __git_command_successful $pipestatus || return
+  fi
+
 #  _wanted $tag expl $description _files -g '{'${(j:,:)files}'}' $compadd_opts -
   _wanted $tag expl $description _multi_parts -f $compadd_opts - / files
 }