mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-09-02 10:01:11 +02:00
Code Releases Activity

45313: _git: Support completion from outside of a worktree when --git-dir/--work-tree are specified on the command line

Browse source 
Revised version of workers/41523.
This commit is contained in:
Daniel Shahaf 2020-01-16 16:42:20 +00:00
parent 7ca2b06501
commit bcd78756c8
2 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -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> 2020-01-16 Daniel Shahaf <danielsh@apache.org>
* 45304: Src/loop.c, Test/A01grammar.ztst: Do execute the always * 45304: Src/loop.c, Test/A01grammar.ztst: Do execute the always

11
Completion/Unix/Command/_git
View file

@ -7075,21 +7075,23 @@ __git_files_relative () {
(( $+functions[__git_files] )) || (( $+functions[__git_files] )) ||
__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 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+: zparseopts -D -E -a opts -- -cached -deleted -modified -others -ignored -unmerged -killed x+: --exclude+:
tag=$1 description=$2; shift 2 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 __git_command_successful $pipestatus || return 1
[[ -n $gittoplevel ]] && gittoplevel+="/"
gitprefix=$(_call_program gitprefix git rev-parse --show-prefix 2>/dev/null) gitprefix=$(_call_program gitprefix git rev-parse --show-prefix 2>/dev/null)
__git_command_successful $pipestatus || return 1 __git_command_successful $pipestatus || return 1
# TODO: --directory should probably be added to $opts when --others is given. # 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 # 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)"}) 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) (option-or-argument)
curcontext=${curcontext%:*:*}:git-$words[1]: 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 ! _call_function ret _git-$words[1]; then
if [[ $words[1] = \!* ]]; then if [[ $words[1] = \!* ]]; then
words[1]=${words[1]##\!} words[1]=${words[1]##\!}