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

completion: complete refs after 'git restore -s'

2020-09-26T22:30:05Z

Currently only the long version (--source=) supports completion. Add completion support to the short (-s) option too. Signed-off-by: Ákos Uzonyi Signed-off-by: Junio C Hamano

completion: use "prev" variable instead of introducing "prevword"

2020-09-26T22:30:03Z

In both _git_checkout and _git_switch a new "prevword" variable were introduced, however the "prev" variable already contains the last word. The "prevword" variable is replaced with "prev", and the case is moved to the beginning of the function, like it's done in many other places (e.g. _git_commit). Also the indentaion of the case is fixed. Signed-off-by: Ákos Uzonyi Signed-off-by: Junio C Hamano

contrib/completion: complete options that take refs for format-patch

2020-09-17T22:23:22Z

The completion for format-patch currently suggests --base=, --interdiff= and --range-diff= as options. However, with these `=` forms of the options, there is no space and we'd enter the `--*` case which means we don't call the __git_complete_revlist() at the end. Teach _git_format_patch() to complete refs in the case of --base=, --interdiff= and --range-diff=. Signed-off-by: Denton Liu Signed-off-by: Junio C Hamano

completion: add GIT_COMPLETION_SHOW_ALL env var

2020-08-20T00:46:17Z

When set to 1, GIT_COMPLETION_SHOW_ALL causes --git-completion-helper-all to be passed instead of --git-completion-helper. Signed-off-by: Ryan Zoeller Signed-off-by: Junio C Hamano

Merge branch 'pd/mergetool-nvimdiff'

2020-08-18T00:02:43Z

The existing backends for "git mergetool" based on variants of vim have been refactored and then support for "nvim" has been added. * pd/mergetool-nvimdiff: mergetools: add support for nvimdiff (neovim) family mergetool--lib: improve support for vimdiff-style tool variants

mergetools: add support for nvimdiff (neovim) family

2020-07-29T21:44:49Z

Signed-off-by: pudinha Signed-off-by: Junio C Hamano

completion: add show --color-moved[-ws]

2020-07-15T20:51:09Z

The completion for diff command was added in fd0bc175576 but missed the show command which also supports --color-moved[-ws]. This suffers from the very same problem [1] as the referenced commit: no comma-separated list completion for --color-moved-ws. [1]: https://github.com/scop/bash-completion/issues/240 Signed-off-by: Michal Privoznik Signed-off-by: Junio C Hamano

completion: nounset mode fixes

2020-07-01T21:55:30Z

Accessing unset variables results an errors when the shell is in nounset/-u mode. This fixes the cases I've come across while using git completion in a shell running in that mode for a while. It's hard to tell if this is the complete set, but at least it improves things. Signed-off-by: Ville Skyttä Signed-off-by: Junio C Hamano

Merge branch 'jk/complete-git-switch'

2020-06-25T19:27:45Z

The command line completion (in contrib/) learned to complete options that the "git switch" command takes. * jk/complete-git-switch: completion: improve handling of --orphan option of switch/checkout completion: improve handling of -c/-C and -b/-B in switch/checkout completion: improve handling of --track in switch/checkout completion: improve handling of --detach in checkout completion: improve completion for git switch with no options completion: improve handling of DWIM mode for switch/checkout completion: perform DWIM logic directly in __git_complete_refs completion: extract function __git_dwim_remote_heads completion: replace overloaded track term for __git_complete_refs completion: add tests showing subpar switch/checkout --orphan logic completion: add tests showing subpar -c/C argument completion completion: add tests showing subpar -c/-C startpoint completion completion: add tests showing subpar switch/checkout --track logic completion: add tests showing subar checkout --detach logic completion: add tests showing subpar DWIM logic for switch/checkout completion: add test showing subpar git switch completion

Merge branch 'vs/complete-stash-show-p-fix'

2020-06-09T01:06:29Z

The command line completion script (in contrib/) tried to complete "git stash -p" as if it were "git stash push -p", but it was too aggressive and also affected "git stash show -p", which has been corrected. * vs/complete-stash-show-p-fix: completion: don't override given stash subcommand with -p