git/contrib/completion/git-completion.bash, branch v2.3.6

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 '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

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

completion: simplify __git_remotes()

2015-03-06T20:48:02Z

The __git_remotes() helper function lists the remotes from the config file by processing the output of a 'git config' query. A simple 'git remote' produces the exact same output, so run that instead. Remotes under '$GIT_DIR/remotes' are still listed by running 'ls -1', because 'git remote' unfortunately ignores them. Signed-off-by: SZEDER Gábor Signed-off-by: Junio C Hamano

Merge branch 'mm/complete-rebase-autostash'

2015-01-14T20:33:57Z

* mm/complete-rebase-autostash: git-completion: add --autostash for 'git rebase'

Merge branch 'pd/completion-filenames-fix'

2015-01-07T21:06:37Z

The top-of-the-file instruction for completion scripts (in contrib/) did not name the files correctly. * pd/completion-filenames-fix: Update documentation occurrences of filename .sh

git-completion: add --autostash for 'git rebase'

2015-01-07T18:42:53Z

This option was added in 58794775 (rebase: implement --[no-]autostash and rebase.autostash, 2013-05-12). Completion of "--autosquash" has been there, but this was not; addition of this would require people completing "--autosquash" to type a bit more than before. Signed-off-by: Matthieu Moy Signed-off-by: Junio C Hamano