From b44be21525d0758c93d8c5fab05fdbd8a9cb0d91 Mon Sep 17 00:00:00 2001
From: Daniel Shahaf <d.s@daniel.shahaf.name>
Date: Tue, 11 Sep 2018 13:24:21 +0000
Subject: 43443: _git: When completing worktrees, show the ref and hash of each
 worktree.

---
 ChangeLog                    |  3 +++
 Completion/Unix/Command/_git | 21 +++++++++++++++++++--
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1f8d43329..1535174f0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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.
 
diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git
index b2f93ff0f..195a7f6dc 100644
--- a/Completion/Unix/Command/_git
+++ b/Completion/Unix/Command/_git
@@ -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] )) ||
-- 
cgit 1.4.1