git/contrib/completion, branch v2.3.7

Merge branch 'ma/bash-completion-leaking-x' into maint

2015-04-27T19:23:51Z

The completion script (in contrib/) contaminated global namespace and clobbered on a shell variable $x. * ma/bash-completion-leaking-x: completion: fix global bash variable leak on __gitcompappend

completion: fix global bash variable leak on __gitcompappend

2015-04-13T05:35:51Z

Signed-off-by: Junio C Hamano

Merge branch 'sg/completion-gitcomp-nl-for-refs' into maint

2015-03-28T16:33:15Z

Code clean-up. * sg/completion-gitcomp-nl-for-refs: completion: use __gitcomp_nl() for completing refs

Merge branch 'ct/prompt-untracked-fix' into maint

2015-03-28T16:33:12Z

The prompt script (in contrib/) did not show the untracked sign when working in a subdirectory without any untracked files. * ct/prompt-untracked-fix: git prompt: use toplevel to find untracked files

Merge branch 'js/completion-ctags-pattern-substitution-fix' into maint

2015-03-27T20:00:18Z

The code that reads from the ctags file in the completion script (in contrib/) did not spell ${param/pattern/string} substitution correctly, which happened to work with bash but not with zsh. * js/completion-ctags-pattern-substitution-fix: contrib/completion: escape the forward slash in __git_match_ctag

Merge branch 'sg/completion-remote' into maint

2015-03-23T18:23:33Z

Code simplification. * sg/completion-remote: completion: simplify __git_remotes() completion: add a test for __git_remotes() helper function

completion: use __gitcomp_nl() for completing refs

2015-03-22T23:41:12Z

We do that almost everywhere, because it's faster for large number of refs, see a31e62629 (completion: optimize refs completion, 2011-10-15). These were the last two places where we still used __gitcomp() for completing refs. Signed-off-by: SZEDER Gábor Signed-off-by: Junio C Hamano

git prompt: use toplevel to find untracked files

2015-03-15T21:23:22Z

The __git_ps1() prompt function would not show an untracked state when all the untracked files are outside the current working directory. Signed-off-by: Cody A Taylor Helped-by: SZEDER Gábor Signed-off-by: Junio C Hamano

contrib/completion: escape the forward slash in __git_match_ctag

2015-03-15T01:59:09Z

The current definition results in an incorrect expansion of the term under zsh. For instance "/^${1////\\/}/" under zsh with the argument "hi" results in: /^/\/h/\/i/ This results in an output similar to this when trying to complete `git grep chartab` under zsh: :: git grep chartabawk: cmd. line:1: /^/\/c/\/h/\/a/\/r/\/t/\/a/\/b/ { print $1 } awk: cmd. line:1: ^ backslash not last character on line awk: cmd. line:1: /^/\/c/\/h/\/a/\/r/\/t/\/a/\/b/ { print $1 } awk: cmd. line:1: ^ syntax error Leaving the prompt in a goofy state until the user hits a key. Escaping the literal / in the parameter expansion (using "/^${1//\//\\/}/") results in: /^chartab/ allowing the completion to work correctly. This formulation also works under bash. Signed-off-by: John Szakmeister Signed-off-by: Junio C Hamano

config,completion: add color.status.unmerged

2015-03-10T22:27:59Z

Reported-by: "Mladen B." Signed-off-by: Michael J Gruber Signed-off-by: Junio C Hamano