diff options
author | Fabian Klötzl <fabian@kloetzl.info> | 2017-07-13 11:19:14 +0200 |
---|---|---|
committer | Oliver Kiddle <opk@zsh.org> | 2017-07-14 12:07:49 +0200 |
commit | 4a63a1793af5f3046af6a77db8aeeece523ebc61 (patch) | |
tree | 2f2b09ecd0dd02f8fe7c67b4c0435e539983c2bc /Completion/Unix/Command/_git | |
parent | 76a4a5ed3cc11d546897b69498905566326f3f26 (diff) | |
download | zsh-4a63a1793af5f3046af6a77db8aeeece523ebc61.tar.gz zsh-4a63a1793af5f3046af6a77db8aeeece523ebc61.tar.xz zsh-4a63a1793af5f3046af6a77db8aeeece523ebc61.zip |
41414: fix for commas used in exclusion lists
also missing escape for _gcc and --no-index option for git diff
Diffstat (limited to 'Completion/Unix/Command/_git')
-rw-r--r-- | Completion/Unix/Command/_git | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git index dcf1f639c..aacd3bfd7 100644 --- a/Completion/Unix/Command/_git +++ b/Completion/Unix/Command/_git @@ -756,7 +756,8 @@ _git-diff () { $diff_options \ '(--exit-code)--quiet[disable all output]' \ $diff_stage_options \ - '(--cached --staged)'{--cached,--staged}'[show diff between index and named commit]' \ + '(--cached --staged)--no-index[show diff between two paths on the filesystem]' \ + '(--cached --staged --no-index)'{--cached,--staged}'[show diff between index and named commit]' \ '(-)--[start file arguments]' \ '*:: :->from-to-file' && ret=0 @@ -774,6 +775,12 @@ _git-diff () { return ret fi + # If "--no-index" was given, only file paths need to be completed. + if [[ -n ${opt_args[(I)--no-index]} ]]; then + _alternative 'files::_files' && ret=0 + return ret + fi + # Otherwise, more complex conditions need to be checked. case $CURRENT in (1) |