git-completion.bash --local

I think this line should include --local:

https://github.com/git/git/blob/next/contrib/completion/git-completion.bash#L1782
    "--global|--system|--file=*)"

This would help for:
    git config -l --local

Thanks, Dasa Paddock

On Sat, Feb 09, 2013 at 06:37:28PM +0000, Dasa Paddock wrote:

Yeah, I think that makes sense.

Care to prepare a patch?

-Peff

When we are trying to show the list of config variables in a file, we recognize "--system", "--global", and "--file" as specifying a particular file. This list misses "--local", which performs a similar function.

Without this patch, completing:

  git config --get --local

shows items from all config files, not just the local one.

Noticed-by: Dasa Paddock <dpaddock@esri.com>
Signed-off-by: Jeff King <peff@peff.net>
---
 contrib/completion/git-completion.bash | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

This needs to be done in two places: __git_config_get_set_variables to allow clever completion of "git config --local --get foo<tab>", and _git_config to allow "git config --loc<tab>" to complete to --local.

While we're there, change the order of options in the code to match git-config.txt.

Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
---

Yes, but not only ;-)

 contrib/completion/git-completion.bash | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Matthieu Moy <Matthieu.Moy@imag.fr> writes:

I see the second hunk is new.  Comments?

How would this interract with the writing side of "git config"? "git config --local foo.bar value" and "git config foo.bar value" are the same, no?

Is it "yes they are the same but it does not hurt?"

On Tue, Feb 12, 2013 at 09:34:39AM -0800, Junio C Hamano wrote:

It makes sense to me. It just means that "--local" itself gets completed (while the other hunk is about using the presence of "--local" impacting other completion). It's an orthogonal issue, but I don't mind them in the same patch.

It doesn't affect writing at all. The change is in __git_config_get_set_variables, which is used only here:

  --get|--get-all|--unset|--unset-all)
        __gitcomp_nl "$(__git_config_get_set_variables)"

So it is purely about completing existing variables, and it's right to limit itself to a particular file if we know that is what has been given.

I'm not sure I understand the original poster's point about "git config -l --local". "-l" does not take a limiter, does it?

-Peff

Jeff King <peff@peff.net> writes:

"git config -l core.\*" will just die without limiting the output to everything under core. hierarchy, so you are right---the combination does not make any sense. You have to say

    git config -l | grep ^core\\.

or something like that.

Completing "git config -l --lo<TAB>" still may help, though.

On Tue, Feb 12, 2013 at 02:13:05PM -0800, Junio C Hamano wrote:

Ah, I think I see Dasa's original point now. He was interested in fixing "--lo<TAB>" to complete "--local". But the line he pointed to in his original message is not the right place for that; it is the site of an unrelated spot which should _also_ be fixed to use "--local", but for a different reason (restricting the variables suggested for "--local --get <TAB>" properly).

So yeah. Matthieu's patch is the right thing to do, as it covers both (mine fixed only half of it).

-Peff

Jeff King <peff@peff.net> writes:

Thanks,

(Sorry, I had missed yours)