summary refs log tree commit diff
path: root/Completion/Unix
diff options
context:
space:
mode:
authorDaniel Shahaf <d.s@daniel.shahaf.name>2016-03-10 23:15:51 +0000
committerDaniel Shahaf <d.s@daniel.shahaf.name>2016-03-10 23:18:36 +0000
commit98fcdb0861af6462d233f6199568d64b01fb7b08 (patch)
tree2c06ecbaa144f509e4bd4be80c82ab83b3dddbf2 /Completion/Unix
parentbe41c522f2e02982f66c080f23b6a54c10c4c091 (diff)
downloadzsh-98fcdb0861af6462d233f6199568d64b01fb7b08.tar.gz
zsh-98fcdb0861af6462d233f6199568d64b01fb7b08.tar.xz
zsh-98fcdb0861af6462d233f6199568d64b01fb7b08.zip
38128: _git: Fix completion of diffs against the index when treeish isn't shell-safe
This affects 'git diff --cached -- <TAB>' and 'git reset $treeish <TAB>'.
Diffstat (limited to 'Completion/Unix')
-rw-r--r--Completion/Unix/Command/_git3
1 files changed, 2 insertions, 1 deletions
diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git
index f0ad3d95d..6c88ad073 100644
--- a/Completion/Unix/Command/_git
+++ b/Completion/Unix/Command/_git
@@ -6077,7 +6077,8 @@ __git_diff-index_files () {
   local tree=$1 description=$2 tag=$3; shift 3
   local files expl
 
-  files=$(_call_program files git diff-index -z --name-only --no-color --cached $tree 2>/dev/null)
+  # $tree needs to be escaped for _call_program; matters for $tree = "HEAD^"
+  files=$(_call_program files git diff-index -z --name-only --no-color --cached ${(q)tree} 2>/dev/null)
   __git_command_successful $pipestatus || return 1
   files=(${(0)"$(__git_files_relative $files)"})
   __git_command_successful $pipestatus || return 1