diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Completion/Unix/Command/_git | 8 |
2 files changed, 11 insertions, 2 deletions
@@ -1,3 +1,8 @@ +2018-09-12 Daniel Shahaf <d.s@daniel.shahaf.name> + + * 43442: Completion/Unix/Command/_git: Break out a helper + function. + 2018-09-12 Peter Stephenson <p.stephenson@samsung.com> * 43450: Src/signals.c: fix window size if reattaching shell diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git index 2cae4c82f..b2f93ff0f 100644 --- a/Completion/Unix/Command/_git +++ b/Completion/Unix/Command/_git @@ -2108,8 +2108,7 @@ _git-worktree() { ;; esac if [[ $state = worktrees ]]; then - _wanted directories expl 'working tree' compadd -S ' ' -f -M 'r:|/=* r:|=*' \ - ${${(M)${(f)"$(_call_program directories git worktree list --porcelain)"}:#worktree*}#* } && ret=0 + __git_worktrees && ret=0 fi ;; esac @@ -7561,6 +7560,11 @@ __git_browsers () { 'builtin-browsers:builtin browser:compadd -a - builtinbrowsers' } +__git_worktrees () { + _wanted directories expl 'working tree' compadd -S ' ' -f -M 'r:|/=* r:|=*' \ + ${${(M)${(f)"$(_call_program directories git worktree list --porcelain)"}:#worktree*}#* } +} + (( $+functions[__git_difftools] )) || __git_difftools () { __git_diff-or-merge-tools diff $* |