diff options
| author | Daniel Shahaf <danielsh@apache.org> | 2020-01-16 16:42:20 +0000 |
|---|---|---|
| committer | Daniel Shahaf <danielsh@apache.org> | 2020-01-17 21:52:45 +0000 |
| commit | bcd78756c8d55b1bab3a9f6fa79eb58782d3000e (patch) | |
| tree | 00ae2d2d8fa7125541a60a329cc4ddce3a63e9f6 | |
| parent | 7ca2b06501b463641426d009a54b21b89b8ca9ee (diff) | |
| download | zsh-bcd78756c8d55b1bab3a9f6fa79eb58782d3000e.tar.gz zsh-bcd78756c8d55b1bab3a9f6fa79eb58782d3000e.tar.xz zsh-bcd78756c8d55b1bab3a9f6fa79eb58782d3000e.zip | |
45313: _git: Support completion from outside of a worktree when --git-dir/--work-tree are specified on the command line
Revised version of workers/41523.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | Completion/Unix/Command/_git | 11 |
2 files changed, 13 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index 675342647..8285bc49c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2020-01-17 Daniel Shahaf <danielsh@apache.org> + + * 45313: Completion/Unix/Command/_git: Support completion from + outside of a worktree when --git-dir/--work-tree are specified + on the command line + 2020-01-16 Daniel Shahaf <danielsh@apache.org> * 45304: Src/loop.c, Test/A01grammar.ztst: Do execute the always diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git index 8e0d57789..92b72b936 100644 --- a/Completion/Unix/Command/_git +++ b/Completion/Unix/Command/_git @@ -7075,21 +7075,23 @@ __git_files_relative () { (( $+functions[__git_files] )) || __git_files () { - local compadd_opts opts tag description gitcdup gitprefix files expl + local compadd_opts opts tag description gittoplevel gitprefix files expl zparseopts -D -E -a compadd_opts V+: J+: 1 2 o+: n f x+: X+: M+: P: S: r: R: q F: zparseopts -D -E -a opts -- -cached -deleted -modified -others -ignored -unmerged -killed x+: --exclude+: tag=$1 description=$2; shift 2 - gitcdup=$(_call_program gitcdup git rev-parse --show-cdup 2>/dev/null) + gittoplevel=$(_call_program toplevel git rev-parse --show-toplevel 2>/dev/null) __git_command_successful $pipestatus || return 1 + [[ -n $gittoplevel ]] && gittoplevel+="/" gitprefix=$(_call_program gitprefix git rev-parse --show-prefix 2>/dev/null) __git_command_successful $pipestatus || return 1 # TODO: --directory should probably be added to $opts when --others is given. - local pref=$gitcdup$gitprefix$PREFIX + local pref=${(Q)${~PREFIX}} + [[ $pref[1] == '/' ]] || pref=$gittoplevel$gitprefix$pref # First allow ls-files to pattern-match in case of remote repository files=(${(0)"$(_call_program files git ls-files -z --exclude-standard ${(q)opts} -- ${(q)${pref:+$pref\*}:-.} 2>/dev/null)"}) @@ -8131,7 +8133,8 @@ _git() { ;; (option-or-argument) curcontext=${curcontext%:*:*}:git-$words[1]: - (( $+opt_args[--git-dir] )) && local -x GIT_DIR=$opt_args[--git-dir] + (( $+opt_args[--git-dir] )) && local -x GIT_DIR=${(Q)${~opt_args[--git-dir]}} + (( $+opt_args[--work-tree] )) && local -x GIT_WORK_TREE=${(Q)${~opt_args[--work-tree]}} if ! _call_function ret _git-$words[1]; then if [[ $words[1] = \!* ]]; then words[1]=${words[1]##\!} |