From 727533088a42064d6b4e6d6c5ebe67dd457fb0da Mon Sep 17 00:00:00 2001
From: Daniel Shahaf <d.s@daniel.shahaf.name>
Date: Wed, 1 Apr 2015 09:28:01 +0000
Subject: 34814: completion: git: Fix bug introduced by 236da69

Based on a patch by Daniel Hahler <git@thequod.de>.
---
 ChangeLog                    | 5 +++++
 Completion/Unix/Command/_git | 4 +++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index b506d9829..51078fb8a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2015-04-01  Daniel Shahaf  <d.s@daniel.shahaf.name>
+
+	* 34814: Completion/Unix/Command/_git: completion: git: Fix
+	bug introduced by 34671 [based on patch by Daniel Hahler]
+
 2015-03-31  Peter Stephenson  <p.w.stephenson@ntlworld.com>
 
 	* users/20058: Completion/Unix/Command/_ip,
diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git
index 9dafd3c97..cc8fa65c3 100644
--- a/Completion/Unix/Command/_git
+++ b/Completion/Unix/Command/_git
@@ -5651,7 +5651,9 @@ __git_recent_commits () {
   __git_command_successful $pipestatus || return 1
 
   for i j k in "$commits[@]" ; do
-    descr+=($i:$k)
+    # Note: the after-the-colon part must be unique across the entire array;
+    # see workers/34768
+    descr+=("$i:[$i] $k")
     j=${${j# \(}%\)} # strip leading ' (' and trailing ')'
     for j in ${(s:, :)j}; do
       if [[ $j == 'tag: '* ]] ; then
-- 
cgit 1.4.1