git/contrib/completion, branch v2.0.2

completion: add missing options for git-merge

2014-05-27T19:27:50Z

The options added to __git_merge_options are those that git-pull passes to git-merge, since that variable is used by both commands. Those added directly in _git_merge() are specific to git-merge and are not passed thru from git-pull. Reported-by: Haralan Dobrev Signed-off-by: John Keeping Signed-off-by: Junio C Hamano

completion: add a note that merge options are shared

2014-05-27T19:27:36Z

This should avoid future confusion after a subsequent patch has added some options to __git_merge_options and some directly in _git_merge(). Signed-off-by: John Keeping Signed-off-by: Junio C Hamano

Merge branch 'rh/prompt-pcmode-avoid-eval-on-refname'

2014-05-19T23:10:10Z

* rh/prompt-pcmode-avoid-eval-on-refname: git-prompt.sh: don't assume the shell expands the value of PS1

git-prompt.sh: don't assume the shell expands the value of PS1

2014-05-19T23:09:53Z

Not all shells subject the prompt string to parameter expansion. Test whether the shell will expand the value of PS1, and use the result to control whether raw ref names are included directly in PS1. This fixes a regression introduced in commit 8976500 ("git-prompt.sh: don't put unsanitized branch names in $PS1"): zsh does not expand PS1 by default, but that commit assumed it did. The bug resulted in prompts containing the literal string '${__git_ps1_branch_name}' instead of the actual branch name. Reported-by: Caleb Thompson Signed-off-by: Richard Hansen Signed-off-by: Junio C Hamano

Merge branch 'fc/prompt-zsh-read-from-file'

2014-05-13T18:53:14Z

* fc/prompt-zsh-read-from-file: contrib: completion: fix 'eread()' namespace

contrib: completion: fix 'eread()' namespace

2014-05-13T18:52:51Z

Otherwise it might collide with a function of the same name in the user's environment. Suggested-by: SZEDER Gábor Signed-off-by: Felipe Contreras Signed-off-by: Junio C Hamano

Merge branch 'rh/prompt-pcmode-avoid-eval-on-refname'

2014-05-02T20:10:53Z

* rh/prompt-pcmode-avoid-eval-on-refname: git-prompt.sh: don't put unsanitized branch names in $PS1

git-prompt.sh: don't put unsanitized branch names in $PS1

2014-04-22T19:37:53Z

Both bash and zsh subject the value of PS1 to parameter expansion, command substitution, and arithmetic expansion. Rather than include the raw, unescaped branch name in PS1 when running in two- or three-argument mode, construct PS1 to reference a variable that holds the branch name. Because the shells do not recursively expand, this avoids arbitrary code execution by specially-crafted branch names such as '$(IFS=_;cmd=sudo_rm_-rf_/;$cmd)'. Signed-off-by: Richard Hansen Signed-off-by: Junio C Hamano

Merge branch 'fc/complete-aliased-push'

2014-04-18T18:17:36Z

* fc/complete-aliased-push: completion: fix completing args of aliased "push", "fetch", etc.

prompt: fix missing file errors in zsh

2014-04-14T20:27:23Z

zsh seems to have a bug while redirecting the stderr of the 'read' command: % read foo 2>/dev/null Signed-off-by: Junio C Hamano