git/contrib/completion, branch v2.2.0

Merge branch 'oc/mergetools-beyondcompare'

2014-10-29T17:08:04Z

* oc/mergetools-beyondcompare: mergetool: rename bc3 to bc

Merge branch 'js/completion-hide-not-a-repo'

2014-10-21T20:28:50Z

Some internal error messages leaked out of the bash completion when typing "git cmd " and the machinery tried to complete refnames. * js/completion-hide-not-a-repo: completion: silence "fatal: Not a git repository" error

mergetool: rename bc3 to bc

2014-10-21T18:25:30Z

Beyond Compare version 4 works the same way as version 3, so rename the existing "bc3" adaptor to just "bc", while keeping "bc3" as a backward compatible wrapper. Noticed-by: Olivier Croquette Helped-by: David Aguilar Signed-off-by: Junio C Hamano

Merge branch 'jc/completion-no-chdir'

2014-10-16T21:16:49Z

* jc/completion-no-chdir: completion: use "git -C $there" instead of (cd $there && git ...)

completion: silence "fatal: Not a git repository" error

2014-10-14T20:06:13Z

It is possible that a user is trying to run a git command and fail to realize that they are not in a git repository or working tree. When trying to complete an operation, __git_refs would fall to a degenerate case and attempt to use "git for-each-ref", which would emit the error. Hide this error message coming from "git for-each-ref". Signed-off-by: John Szakmeister Signed-off-by: Junio C Hamano

completion: use "git -C $there" instead of (cd $there && git ...)

2014-10-09T22:06:08Z

We have had "git -C $there" to first go to a different directory and run a Git command without changing the arguments for quite some time. Use it instead of (cd $there && git ...) in the completion script. This allows us to lose the work-around for misfeatures of modern interactive-minded shells that make "cd" unusable in scripts (e.g. end users' $CDPATH taking us to unexpected places in any POSIX shell, and chpwd functions spewing unwanted output in zsh). Based on Øystein Walle's idea, which was raised during the discussion on the solution by Brandon Turner for a problem zsh users had with RVM which mucks with chpwd_functions in users' environments (https://github.com/wayneeseguin/rvm/issues/3076). As $root variable, which is used to direct where to chdir to, is set to "." based on if $2 to __git_index_files is set (not if it is empty), the only caller of the function is fixed not to pass the optional $2 when it does not want us to switch to a different directory. Otherwise we would end up doing "git -C '' command...", which would not work. Maybe we would want "git -C '' command..." to mean "do not chdir anywhere", but that is a spearate topic. Signed-off-by: Junio C Hamano

completion: add --show-signature for log and show

2014-10-07T19:00:48Z

Signed-off-by: David Aguilar Signed-off-by: Junio C Hamano

Merge branch 'jk/prompt-stash-could-be-packed' into maint

2014-09-19T21:05:11Z

* jk/prompt-stash-could-be-packed: git-prompt: do not look for refs/stash in $GIT_DIR

Merge branch 'tb/complete-diff-ignore-blank-lines'

2014-09-19T18:38:38Z

* tb/complete-diff-ignore-blank-lines: completion: Add --ignore-blank-lines for diff

Merge branch 'jk/prompt-stash-could-be-packed'

2014-09-09T19:54:08Z

The prompt script checked $GIT_DIR/ref/stash file to see if there is a stash, which was a no-no. * jk/prompt-stash-could-be-packed: git-prompt: do not look for refs/stash in $GIT_DIR