diff options
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | Completion/Unix/Command/_git | 5 |
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index 7449386e1..325638c30 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2018-05-08 Peter Stephenson <p.stephenson@samsung.com> + * 42752: Completion/Unx/Command/_git: better completion + handling for git aliases expanding to external command. + * 42751: Src/Zle/zle_main.c: Protect shell status around time function execution in line editor. diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git index f6cec8b60..21ba65724 100644 --- a/Completion/Unix/Command/_git +++ b/Completion/Unix/Command/_git @@ -7758,7 +7758,10 @@ _git() { curcontext=${curcontext%:*:*}:git-$words[1]: (( $+opt_args[--git-dir] )) && local -x GIT_DIR=$opt_args[--git-dir] if ! _call_function ret _git-$words[1]; then - if zstyle -T :completion:$curcontext: use-fallback; then + if [[ $words[1] = \!* ]]; then + words[1]=${words[1]##\!} + _normal && ret=0 + elif zstyle -T :completion:$curcontext: use-fallback; then _default && ret=0 else _message "unknown sub-command: $words[1]" |