Zsh Mailing List Archive
Messages sorted by: Reverse Date, Date, Thread, Author

Re: Fix a typo in _git.



On Sat, Aug 16, 2008 at 01:56:36AM +0200, Mikael Magnusson wrote:
> I have some other _git patches too, but they're sort of jumbled up and have
> some XXXes, but if anyone is curious they can look here:
> http://git.mika.l3ib.org/?p=zsh-cvs.git;a=history;f=Completion/Unix/Command/_git;h=mika

Committing this one:

From: Mikael Magnusson <mikachu@xxxxxxxxx>
Date: Sun, 17 Feb 2008 18:08:01 +0000 (+0100)
Subject: make git diff and git log completion better.
X-Git-Url: http://git.mika.l3ib.org:1234/?p=zsh-cvs.git;a=commitdiff_plain;h=0a58b71d897896262f91cfe0bfa1c99d7761a179

make git diff and git log completion better.
---

diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git
index 20e8d1d..4592c66 100644
--- a/Completion/Unix/Command/_git
+++ b/Completion/Unix/Command/_git
@@ -1596,9 +1596,10 @@ _git-diff () {
   _arguments -S \
     $diff_args \
     '--cached[show diff between index and named commit]' \
-    '::original revision:__git_commits' \
-    '::new revision:__git_commits' \
-    '*::index file:__git_modified_files' && ret=0
+    '::commit range:__git_commit_ranges' \
+    '::original revision:__git_objects' \
+    '::new revision:__git_objects' \
+    '*::index file:__git_files' && ret=0
 }
 
 (( $+functions[_git-fetch] )) ||
@@ -1726,9 +1727,9 @@ _git-log () {
 
   case $state in
     (files)
-      _alternative \
-        'files:index file:__git_cached_files' \
-        'branches:branch:__git_branch_names' && ret=0
+      _arguments -S \
+        '::index file:__git_cached_files' \
+        '*::branch:__git_commit_ranges' && ret=0
       ;;
   esac
 }



Messages sorted by: Reverse Date, Date, Thread, Author