summary refs log tree commit diff
diff options
context:
space:
mode:
authorDaniel Shahaf <d.s@daniel.shahaf.name>2015-08-18 04:19:27 +0000
committerDaniel Shahaf <d.s@daniel.shahaf.name>2015-08-19 23:28:11 +0000
commitd70e7149df96e94e747ea3ed9ae6787f5a04d8b5 (patch)
tree0e0dd10dad2831473a7631b92a84be3f8ca1d195
parentea5d100643646af718309d54975424f08963fe6f (diff)
downloadzsh-d70e7149df96e94e747ea3ed9ae6787f5a04d8b5.tar.gz
zsh-d70e7149df96e94e747ea3ed9ae6787f5a04d8b5.tar.xz
zsh-d70e7149df96e94e747ea3ed9ae6787f5a04d8b5.zip
36236: _git-log: complete 'git rm'd files
-rw-r--r--ChangeLog5
-rw-r--r--Completion/Unix/Command/_git6
2 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 21cd189fa..3e361c5a7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2015-08-19  Daniel Shahaf  <d.s@daniel.shahaf.name>
+
+	* 36236: Completion/Unix/Command/_git: _git-log: complete
+	'git rm'd files
+
 2015-08-19  Oliver Kiddle  <opk@zsh.org>
 
 	* 36148: Completion/Unix/Command/_git: _git-log: Complete flags
diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git
index 3c20ca663..df9375ff4 100644
--- a/Completion/Unix/Command/_git
+++ b/Completion/Unix/Command/_git
@@ -1093,11 +1093,11 @@ _git-log () {
   case $state in
     (first-commit-ranges-or-files)
       if [[ -n ${opt_args[(I)--]} ]]; then
-	__git_cached_files && ret=0
+	__git_tree_files ${PREFIX:-.} HEAD && ret=0
       else
 	_alternative \
 	  'commit-ranges::__git_commit_ranges' \
-	  'cached-files::__git_cached_files' && ret=0
+	  'cached-files::__git_tree_files ${PREFIX:-.} HEAD' && ret=0
       fi
     ;;
     (commit-ranges-or-files)
@@ -1109,7 +1109,7 @@ _git-log () {
       elif __git_is_committish $line[1]; then
 	__git_tree_files ${PREFIX:-.} $line[1] && ret=0
       else
-	__git_cached_files && ret=0
+	__git_tree_files ${PREFIX:-.} HEAD && ret=0
       fi
     ;;
   esac