SZEDER GGGbor <szeder@xxxxxxxxxx> wrote: > Sometimes it's handy to complete full refs, e.g. the user has some > refs outside of refs/{heads,remotes,tags} or the user wants to > complete some git command's special refs (like 'git show > refs/bisect/bad'). ... > On Thu, Nov 27, 2008 at 01:29:38PM -0800, Shawn O. Pearce wrote: > > I wonder if the pattern shouldn't be: > > > > refs|refs/*) > > > > to reduce the risk of matching "refs-" and trying to do a full ref > > match instead of a short ref match. > Good point. Adjusted the code and commit message accordingly. Thanks. Acked-by: Shawn O. Pearce <spearce@xxxxxxxxxxx> > contrib/completion/git-completion.bash | 19 +++++++++++++++---- > 1 files changed, 15 insertions(+), 4 deletions(-) > > diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash > index 0ee071b..244ed41 100755 > --- a/contrib/completion/git-completion.bash > +++ b/contrib/completion/git-completion.bash > @@ -188,11 +188,22 @@ __git_tags () > > __git_refs () > { > - local cmd i is_hash=y dir="$(__gitdir "$1")" > + local i is_hash=y dir="$(__gitdir "$1")" > + local cur="${COMP_WORDS[COMP_CWORD]}" format refs > if [ -d "$dir" ]; then > - if [ -e "$dir/HEAD" ]; then echo HEAD; fi > - git --git-dir="$dir" for-each-ref --format='%(refname:short)' \ > - refs/tags refs/heads refs/remotes > + case "$cur" in > + refs|refs/*) > + format="refname" > + refs="${cur%/*}" > + ;; > + *) > + if [ -e "$dir/HEAD" ]; then echo HEAD; fi > + format="refname:short" > + refs="refs/tags refs/heads refs/remotes" > + ;; > + esac > + git --git-dir="$dir" for-each-ref --format="%($format)" \ > + $refs > return > fi > for i in $(git ls-remote "$dir" 2>/dev/null); do > -- > 1.6.0.4.814.gfe502 > -- Shawn. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html