zsh-users
 help / color / mirror / code / Atom feed
From: Bart Schaefer <schaefer@brasslantern.com>
To: zsh-users@zsh.org
Subject: Re: Approximate file path completion for git?
Date: Fri, 10 Jan 2014 23:37:25 -0800	[thread overview]
Message-ID: <140110233725.ZM22285@torch.brasslantern.com> (raw)
In-Reply-To: <140110213433.ZM22191@torch.brasslantern.com>

On Jan 10,  9:34pm, Bart Schaefer wrote:
}
} Hmm, this looks as though it may have been broken by workers/31159
} 
} Probably what we need here is either a zstyle to let the user choose
} whether path completion works, or to simply attempt ls-files a second
} time without the prefix if the first attempt doesn't give any results.

Here's a third possibility that occurred to me.  This backs out 31159
and then adds the no_nomatch option when running git ls-files.  Maybe
that satisfies Torstein's issues?  It restores partial path completion
in some cases that I found to be failing before.


diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git
index 43a01d9..9e364c8 100644
--- a/Completion/Unix/Command/_git
+++ b/Completion/Unix/Command/_git
@@ -5683,7 +5683,7 @@ __git_files () {
   # TODO: --directory should probably be added to $opts when --others is given.
 
   local pref=$gitcdup$gitprefix$PREFIX
-  files=(${(0)"$(_call_program files git ls-files -z --exclude-standard $opts -- ${pref:+$pref\\\*} 2>/dev/null)"})
+  files=(${(0)"$(setopt no_nomatch; _call_program files git ls-files -z --exclude-standard $opts -- ${pref:+$pref\*} 2>/dev/null)"})
   __git_command_successful $pipestatus || return
 
 #  _wanted $tag expl $description _files -g '{'${(j:,:)files}'}' $compadd_opts -


  reply	other threads:[~2014-01-11  7:37 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-01-11  4:50 Keerthan jai.c
2014-01-11  5:34 ` Bart Schaefer
2014-01-11  7:37   ` Bart Schaefer [this message]
2014-01-11 17:58     ` Bart Schaefer
2014-01-11 22:13       ` Keerthan jai.c
2014-01-11 23:41         ` Bart Schaefer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=140110233725.ZM22285@torch.brasslantern.com \
    --to=schaefer@brasslantern.com \
    --cc=zsh-users@zsh.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.vuxu.org/mirror/zsh/

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).