about summary refs log tree commit diff
diff options
context:
space:
mode:
authorDaniel Shahaf <d.s@daniel.shahaf.name>2015-10-31 12:54:56 +0000
committerDaniel Shahaf <d.s@daniel.shahaf.name>2015-10-31 13:03:54 +0000
commit0e510f0c3522c9b18e9320388dd232a84fa79351 (patch)
tree3c7a4589e1f586d7fae1cb3cfbfb5741e52b49b2
parent1eef57b3d15af235430ad2b5e2940ded375e69d2 (diff)
downloadzsh-0e510f0c3522c9b18e9320388dd232a84fa79351.tar.gz
zsh-0e510f0c3522c9b18e9320388dd232a84fa79351.tar.xz
zsh-0e510f0c3522c9b18e9320388dd232a84fa79351.zip
37032: Temporarily revert 36959.
-rw-r--r--ChangeLog4
-rw-r--r--Completion/Unix/Command/_git5
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index ed5cd5e6b..499c871e4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2015-10-31  Daniel Shahaf  <d.s@daniel.shahaf.name>
+
+	* 37032: Completion/Unix/Command/_git: Temporarily revert 36959.
+
 2015-10-30  Daniel Shahaf  <d.s@daniel.shahaf.name>
 
 	* unposted (after 37018): Src/params.c, Test/E01options.ztst: Fix
diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git
index 320bfa712..df7a7d900 100644
--- a/Completion/Unix/Command/_git
+++ b/Completion/Unix/Command/_git
@@ -5696,7 +5696,10 @@ __git_recent_commits () {
       else
         label="[HEAD~$distance_from_head]"
       fi
-      descr+=("@~${distance_from_head}":"${label} $k") # CROSSREF: use the same label as below
+      ## Disabled because _describe renders the output unhelpfuly when this function
+      ## is called twice during a single completion operation, and list-grouped is
+      ## in its default setting (enabled).
+      #descr+=("@~${distance_from_head}":"${label} $k") # CROSSREF: use the same label as below
 
       # Prepare for the next first-parent-ancestry commit.
       (( ++distance_from_head ))