From 72de6a1e7f16d6087383f003201f32503975b68b Mon Sep 17 00:00:00 2001 From: Clint Adams Date: Sat, 4 Aug 2007 16:39:25 +0000 Subject: 23739: merge in git diff completion fixes from Nikolai Weibull's repository. --- ChangeLog | 5 +++++ Completion/Unix/Command/_git | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index aa1555297..4655c8090 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2007-08-04 Clint Adams + + * 23739: Completion/Unix/Command/_git: merge in git diff + completion fixes from Nikolai Weibull's repository. + 2007-08-01 Peter Stephenson * 23736: Src/hist.c: status for file save wasnʼt diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git index 3c10e0b1b..85be44246 100644 --- a/Completion/Unix/Command/_git +++ b/Completion/Unix/Command/_git @@ -939,11 +939,11 @@ _git-commit () { # TODO: __git_files should be __git_tree_files (do like in git-diff-tree and # such) _git-diff () { - _arguments \ + _arguments -S \ $diff_args \ - '::original revision:__git_revisions' \ - '::new revision:__git_revisions' \ - '*:index file:__git_files' && ret=0 + '::original revision:__git_commits' \ + '::new revision:__git_commits' \ + '*::index file:__git_modified_files' && ret=0 } _git-fetch () { -- cgit 1.4.1