mirror/ zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2024-05-04 14:46:20 +02:00
Code

43443: _git: When completing worktrees, show the ref and hash of each worktree.

This commit is contained in:
Daniel Shahaf 2018-09-11 13:24:21 +00:00
parent 7ae2be3a2f
commit b44be21525
2 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,5 +1,8 @@
2018-09-12 Daniel Shahaf <d.s@daniel.shahaf.name>
* 43443: Completion/Unix/Command/_git: When completing worktrees,
show the ref and hash of each worktree.
* 43442: Completion/Unix/Command/_git: Break out a helper
function.

21
Completion/Unix/Command/_git
View File

@ -7561,8 +7561,25 @@ __git_browsers () {
}
__git_worktrees () {
_wanted directories expl 'working tree' compadd -S ' ' -f -M 'r:|/=* r:|=*' \
${${(M)${(f)"$(_call_program directories git worktree list --porcelain)"}:#worktree*}#* }
local -a records=( ${(ps.\n\n.)"$(_call_program directories git worktree list --porcelain)"} )
local -a directories descriptions
local i hash branch
for i in $records; do
directories+=( ${${i%%$'\n'*}#worktree } )
hash=${${${"${(f)i}"[2]}#HEAD }[1,9]}
branch=${${"${(f)i}"[3]}#branch refs/heads/}
# Simulate the non-porcelain output
if [[ $branch == detached ]]; then
# TODO: show a ref that points at $hash here, like vcs_info does?
branch="(detached HEAD)"
else
branch="[$branch]"
fi
descriptions+=( "${directories[-1]}"$'\t'"$hash $branch" )
done
_wanted directories expl 'working tree' compadd -ld descriptions -S ' ' -f -M 'r:|/=* r:|=*' -a directories
}
(( $+functions[__git_difftools] )) ||