diff options
| author | SZEDER Gábor <szeder.dev@gmail.com> | 2017-02-03 02:48:21 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-02-04 06:18:40 (GMT) |
| commit | 7b329b9dab276d7a90141a1c9260a6943c9dd007 (patch) | |
| tree | 0c735db48f10a3ac9f2493888409792345aad313 /contrib | |
| parent | 91b7ea81e87e9c0fd485edf39f0ad982d0350110 (diff) | |
| download | git-7b329b9dab276d7a90141a1c9260a6943c9dd007.zip git-7b329b9dab276d7a90141a1c9260a6943c9dd007.tar.gz git-7b329b9dab276d7a90141a1c9260a6943c9dd007.tar.bz2 | |
completion: don't offer commands when 'git --opt' needs an argument
The main git options '--git-dir', '-c', '-C', '--worktree' and
'--namespace' require an argument, but attempting completion right
after them lists git commands.
Don't offer anything right after these options, thus let Bash fall
back to filename completion, because
- the three options '--git-dir', '-C' and '--worktree' do actually
require a path argument, and
- we don't complete the required argument of '-c' and '--namespace',
and in that case the "standard" behavior of our completion script
is to not offer anything, but fall back to filename completion.
Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/completion/git-completion.bash | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index f59755d..92231c6 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -2808,6 +2808,17 @@ __git_main () done if [ -z "$command" ]; then + case "$prev" in + --git-dir|-C|--work-tree) + # these need a path argument, let's fall back to + # Bash filename completion + return + ;; + -c|--namespace) + # we don't support completing these options' arguments + return + ;; + esac case "$cur" in --*) __gitcomp " --paginate |