summary refs log tree commit diff
diff options
context:
space:
mode:
authorNikolai Weibull <pcppopper@users.sourceforge.net>2011-08-17 10:50:26 +0000
committerNikolai Weibull <pcppopper@users.sourceforge.net>2011-08-17 10:50:26 +0000
commit9e8cdf31b9dc1d0d9bd599b07dff9777602b7ab4 (patch)
tree1b801119c24de87cff0edc7990d047df9f506c1a
parent2a79494070d9805a7f3ab97ba18ae2733737ec52 (diff)
downloadzsh-9e8cdf31b9dc1d0d9bd599b07dff9777602b7ab4.tar.gz
zsh-9e8cdf31b9dc1d0d9bd599b07dff9777602b7ab4.tar.xz
zsh-9e8cdf31b9dc1d0d9bd599b07dff9777602b7ab4.zip
29698: Completion/Unix/Command/_git: Complete diff options for git log
-rw-r--r--ChangeLog7
-rw-r--r--Completion/Unix/Command/_git5
2 files changed, 10 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index eba819cb7..3c3b3b538 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-08-17  Nikolai Weibull  <now@bitwi.se>
+
+	* 29698: Completion/Unix/Command/_git: Complete diff options for git
+	log.
+
 2011-08-17  Mikael Magnusson  <mikachu@gmail.com>
 
 	* 29681: Src/Zle/zle_refresh.c: consistently use [] to access
@@ -15284,5 +15289,5 @@
 
 *****************************************************
 * This is used by the shell to define $ZSH_PATCHLEVEL
-* $Revision: 1.5435 $
+* $Revision: 1.5436 $
 *****************************************************
diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git
index fb0450608..6221eb6a4 100644
--- a/Completion/Unix/Command/_git
+++ b/Completion/Unix/Command/_git
@@ -987,13 +987,15 @@ _git-log () {
   local curcontext=$curcontext state line ret=1
   declare -A opt_args
 
-  local -a log_options revision_options
+  local -a log_options revision_options diff_options
   __git_setup_log_options
   __git_setup_revision_options
+  __git_setup_diff_options
 
   _arguments -w -C -s \
     $log_options \
     $revision_options \
+    $diff_options \
     '(-)--[start file arguments]' \
     '*:: :->commit-range-or-file' && ret=0
 
@@ -5340,6 +5342,7 @@ __git_files () {
   files=(${(0)"$(_call_program files git ls-files -z --exclude-standard $opts -- ${pref:+$pref\*} 2>/dev/null)"})
   __git_command_successful $pipestatus || return
 
+#  _wanted $tag expl $description _files -g '{'${(j:,:)files}'}' $compadd_opts -
   _wanted $tag expl $description _multi_parts -f $compadd_opts - / files
 }