summary refs log tree commit diff
diff options
context:
space:
mode:
authorDaniel Shahaf <d.s@daniel.shahaf.name>2016-03-18 21:21:44 +0000
committerDaniel Shahaf <d.s@daniel.shahaf.name>2016-03-21 16:12:13 +0000
commitce4c9eafc491aad1213a1cc8e3c6e07057a01e4b (patch)
treef4df68b95f502604591dca94999fd4b600ddc2d4
parent67136df0bf5d4b75e10c37fb19d49c28e098f052 (diff)
downloadzsh-ce4c9eafc491aad1213a1cc8e3c6e07057a01e4b.tar.gz
zsh-ce4c9eafc491aad1213a1cc8e3c6e07057a01e4b.tar.xz
zsh-ce4c9eafc491aad1213a1cc8e3c6e07057a01e4b.zip
38181: _git reflog: Complete '@{N}' instead of 'HEAD@{N}'.
The «HEAD@{...}» syntax is no longer completed, since it's not easily possible
to support both syntaxes (workers/34768).
-rw-r--r--ChangeLog3
-rw-r--r--Completion/Unix/Command/_git1
2 files changed, 4 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index b708d3e58..ab799d1eb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2016-03-21  Daniel Shahaf  <d.s@daniel.shahaf.name>
 
+	* 38181: Completion/Unix/Command/_git: _git reflog: Complete
+	'@{N}' instead of 'HEAD@{N}'.
+
 	* 38180: Completion/Unix/Command/_git: Improve reflog completion.
 
 2016-03-21  Peter Stephenson  <p.stephenson@samsung.com>
diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git
index 9eeda5837..0eb8532e2 100644
--- a/Completion/Unix/Command/_git
+++ b/Completion/Unix/Command/_git
@@ -5475,6 +5475,7 @@ __git_reflog_entries () {
   declare -a reflog_entries
 
   reflog_entries=(${(f)"$(_call_program reflog-entries "git reflog -1000 --pretty='%gD:[%h] %gs'" 2>/dev/null)"})
+  reflog_entries=( ${reflog_entries/HEAD@$'\x7b'/@$'\x7b'} )
   __git_command_successful $pipestatus || return 1
 
   _describe -Vx -t reflog-entries 'reflog entry' reflog_entries