git/contrib/completion, branch v1.8.2.2

Merge branch 'fc/untracked-zsh-prompt' into maint

2013-04-26T18:12:30Z

* fc/untracked-zsh-prompt: prompt: fix untracked files for zsh

completion: remove duplicate block for "git commit -c"

2013-04-24T23:05:07Z

Remove one of two consecutive, identical blocks for "git commit -c". This was caused by a mechanical mismerge at d931e2fb252e (Merge branch 'mp/complete-paths', 2013-02-08). The side branch wanted to add this block at fea16b47 but the same fix was done independently at 685397585 already. Signed-off-by: Mårten Kongstad Signed-off-by: Junio C Hamano

prompt: fix untracked files for zsh

2013-04-22T01:01:37Z

We signal presense of untracked files by adding a per-cent sign '%' to the prompt. But because '%' is used as an escape character to introduce prompt customization in zsh (just like bash prompt uses '\' to escape '\u', '\h', etc.), we need to say '%%' to get a literal per-cent. Helped-by: Andreas Schwab Signed-off-by: Felipe Contreras Signed-off-by: Junio C Hamano

bash: teach __git_ps1 about REVERT_HEAD

2013-04-01T02:07:26Z

Signed-off-by: Robin Rosenberg Signed-off-by: Junio C Hamano

Merge branch 'mp/complete-paths'

2013-03-11T17:32:16Z

* mp/complete-paths: git-completion.bash: zsh does not implement function redirection correctly

git-completion.bash: zsh does not implement function redirection correctly

2013-03-11T17:22:56Z

A recent change added functions whose entire standard error stream is redirected to /dev/null using a construct that is valid POSIX.1 but is not widely used: funcname () { cd "$1" && run some command "$2" } 2>/dev/null Even though this file is "git-completion.bash", zsh completion support dot-sources it (instead of asking bash to grok it like tcsh completion does), and zsh does not implement this redirection correctly. With zsh, trying to complete an inexistant directory gave this: git add no-such-dir/__git_ls_files_helper:cd:2: no such file or directory: no-such-dir/ Also these functions use "cd" to first go somewhere else before running a command, but the location the caller wants them to go that is given as an argument to them should not be affected by CDPATH variable the users may have set for their interactive session. To fix both of these, wrap the body of the function in a subshell, unset CDPATH at the beginning of the subshell, and redirect the standard error stream of the subshell to /dev/null. Signed-off-by: Matthieu Moy Signed-off-by: Junio C Hamano

Merge branch 'mp/complete-paths'

2013-03-07T21:11:55Z

* mp/complete-paths: git-completion.zsh: define __gitcomp_file compatibility function

git-completion.zsh: define __gitcomp_file compatibility function

2013-03-05T16:54:03Z

Commit fea16b47b60 (Fri Jan 11 19:48:43 2013, Manlio Perillo, git-completion.bash: add support for path completion), introduced a new __gitcomp_file function that uses the bash builtin "compgen". The function was redefined for ZSH in the deprecated section of git-completion.bash, but not in the new git-completion.zsh script. As a result, users of git-completion.zsh trying to complete "git add fo" get an error: git add fo__gitcomp_file:8: command not found: compgen This patch adds the redefinition and removes the error. Signed-off-by: Matthieu Moy Signed-off-by: Junio C Hamano

shell-prompt: clean up nested if-then

2013-02-18T23:33:31Z

Minor clean up of if-then nesting in checks for environment variables and config options. No functional changes. Signed-off-by: Martin Erik Werner Signed-off-by: Junio C Hamano

Merge branch 'mp/diff-algo-config'

2013-02-17T23:25:52Z

Add diff.algorithm configuration so that the user does not type "diff --histogram". * mp/diff-algo-config: diff: Introduce --diff-algorithm command line option config: Introduce diff.algorithm variable git-completion.bash: Autocomplete --minimal and --histogram for git-diff