about summary refs log tree commit diff
diff options
context:
space:
mode:
authorDaniel Hahler <git@thequod.de>2015-05-19 06:35:26 +0200
committerDaniel Hahler <git@thequod.de>2015-05-19 06:38:43 +0200
commitd0057538d3a30f1abaddf00171888c5d3527a067 (patch)
tree0ed5b83ac7ff86da230997f572034a5a7cf3bcdd
parent1e7bb4a8f8c965e0ad61b09154f04b31aa57e07b (diff)
downloadzsh-d0057538d3a30f1abaddf00171888c5d3527a067.tar.gz
zsh-d0057538d3a30f1abaddf00171888c5d3527a067.tar.xz
zsh-d0057538d3a30f1abaddf00171888c5d3527a067.zip
35204: fix broken __git_recent_commits from previous commit
This fixes 1e7bb4a: newlines need to be kept (from the "%d" part).
-rw-r--r--ChangeLog3
-rw-r--r--Completion/Unix/Command/_git2
2 files changed, 4 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index a1067a7de..0a7f6aa35 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,9 @@
 	* 35164: Completion/Unix/Command/_git: fix $pipestatus with
 	__git_commit_objects/__git_recent_commits.
 
+	* 35204: Completion/Unix/Command/_git: fix quoting in previous commit
+	commit (35164).
+
 2015-05-19  Daniel Shahaf  <d.s@daniel.shahaf.name>
 
 	* users/20222: Completion/Unix/Command/_git: users/20222:
diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git
index 6901b42e3..18d895469 100644
--- a/Completion/Unix/Command/_git
+++ b/Completion/Unix/Command/_git
@@ -5676,7 +5676,7 @@ __git_recent_commits () {
 
   # Careful: most %d will expand to the empty string.  Quote properly!
   # NOTE: we could use %D directly, but it's not available in git 1.9.1 at least.
-  commits=(${(@f)"$(_call_program commits git --no-pager log -20 --format='%h%n%d%n%s\ \(%cr\)')"})
+  commits=("${(f)"$(_call_program commits git --no-pager log -20 --format='%h%n%d%n%s\ \(%cr\)')"}")
   __git_command_successful $pipestatus || return 1
 
   for i j k in "$commits[@]" ; do