about summary refs log tree commit diff
diff options
context:
space:
mode:
authorDaniel Hahler <git@thequod.de>2015-05-14 18:56:23 +0200
committerOliver Kiddle <opk@zsh.org>2015-05-14 18:56:23 +0200
commitfec4e7243b3ef960fb5c4fd6b0bb54f4da34f949 (patch)
treec2799e16c20dad23a645bf0203693f828154104b
parent85a4cf9b36fe7cf876266a49950e80d00ca4c18f (diff)
downloadzsh-fec4e7243b3ef960fb5c4fd6b0bb54f4da34f949.tar.gz
zsh-fec4e7243b3ef960fb5c4fd6b0bb54f4da34f949.tar.xz
zsh-fec4e7243b3ef960fb5c4fd6b0bb54f4da34f949.zip
35016: introduce new pretty formats %g[sdD] for reflog information
-rw-r--r--ChangeLog5
-rw-r--r--Completion/Unix/Command/_git2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 02f6dd3e0..d048cb5c5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2015-05-14  Oliver Kiddle  <opk@zsh.org>
+
+	* Daniel Hahler: 35016: Completion/Unix/Command/_git:
+	introduce new pretty formats %g[sdD] for reflog information
+
 2015-05-14  Peter Stephenson  <p.stephenson@samsung.com>
 
 	* 35110: Src/builtin.c, Doc/Zsh/params.yo: don't
diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git
index c01333ba4..5df01f706 100644
--- a/Completion/Unix/Command/_git
+++ b/Completion/Unix/Command/_git
@@ -5532,7 +5532,7 @@ __git_stashes () {
   local expl
   declare -a stashes
 
-  stashes=(${${(f)"$(_call_program stashes git stash list 2>/dev/null)"}/: */})
+  stashes=(${(f)"$(_call_program stashes git stash list --pretty=format:%gd 2>/dev/null)"})
   __git_command_successful $pipestatus || return 1
 
   _wanted stashes expl stash compadd "$@" -a - stashes