From d90775fc29425934895b0222aa4092f12e9bcd1c Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Thu, 3 Nov 2016 16:00:45 +0100 Subject: 39822: _git: remove "-A '-*'" with _arguments for some commands With e.g. `git rebase origin/master` you can have options like `--no-autosquash` after the argument. I have tried the commands where this patch removes `-A`. Commands like `git fetch-pack` that do not support options after arguments are left unchanged. --- ChangeLog | 4 ++++ Completion/Unix/Command/_git | 10 +++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3ed655135..63c80e04d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2016-11-03 Daniel Hahler + * 39822: Completion/Unix/Command/_git: remove "-A '-*'" with + _arguments for some commands. + 2016-11-03 Peter Stephenson * 39815: Src/lex.c, Test/D04parameter.ztst: read input to end diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git index f10f80bf7..17a7b1e07 100644 --- a/Completion/Unix/Command/_git +++ b/Completion/Unix/Command/_git @@ -1383,7 +1383,7 @@ _git-rebase () { '(--autosquash )--no-autosquash[do not check for auto-squash boundaries]') fi - _arguments -A '-*' \ + _arguments \ - actions \ '(-)--continue[continue after resolving merge conflict]' \ '(-)--abort[abort current rebase]' \ @@ -1921,7 +1921,7 @@ _git-tag () { ) fi - _arguments -A '-*' \ + _arguments \ - creation \ '(-a --annotate -s --sign -u --local-user)'{-a,--annotate}'[create an unsigned, annotated tag]' \ '(-a --annotate -s --sign -u --local-user)'{-s,--sign}'[create a signed and annotated tag]' \ @@ -4539,7 +4539,7 @@ _git-pack-objects () { fi # NOTE: --index-version is only used by the Git test suite. - _arguments -A '-*' \ + _arguments \ '(-q --quiet)'{-q,--quiet}"[don't report progress]" \ '(-q --quiet --all-progress)--progress[show progress meter]' \ '(-q --quiet --progress --all-progress-implied)--all-progress[show progress meter during object writing phase]' \ @@ -4876,7 +4876,7 @@ _git-ls-files () { (( $+functions[_git-ls-remote] )) || _git-ls-remote () { # TODO: repository needs fixing - _arguments -A '-*' \ + _arguments \ '(-q --quiet)'{-q,--quiet}"[don't print remote URL]" \ '--upload-pack=[specify path to git-upload-pack on remote side]:remote path' \ '(-h --heads)'{-h,--heads}'[show only refs under refs/heads]' \ @@ -5007,7 +5007,7 @@ _git-show-ref () { (( $+functions[_git-unpack-file] )) || _git-unpack-file () { - _arguments -A '-*' \ + _arguments \ '(:)-h[display usage information]' \ '(-): :__git_blobs' } -- cgit v1.2.3