diff options
| author | Frank Terbeck <bewater@users.sourceforge.net> | 2011-03-18 22:39:41 +0000 |
|---|---|---|
| committer | Frank Terbeck <bewater@users.sourceforge.net> | 2011-03-18 22:39:41 +0000 |
| commit | b85b9a229d2c8c1ea72d59fd391037e30d0844bd (patch) | |
| tree | 50d1fcf846e150a42899879222bc054303a0dbcb | |
| parent | 9e2278e0c1917d8441d028b963bb6ad5082f39fa (diff) | |
| download | zsh-b85b9a229d2c8c1ea72d59fd391037e30d0844bd.tar.gz zsh-b85b9a229d2c8c1ea72d59fd391037e30d0844bd.tar.xz zsh-b85b9a229d2c8c1ea72d59fd391037e30d0844bd.zip | |
Nikolai Weibull: 28911: Only show modified files for git-checkout without tree.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | Completion/Unix/Command/_git | 4 |
2 files changed, 7 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index f3e745261..004548ff8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,10 @@ 2011-03-18 Frank Terbeck <ft@bewatermyfriend.org> * Nikolai Weibull: 28914: Completion/Unix/Command/_git: Typo - fix in `cvsexportcommit' description + fix in `cvsexportcommit' description. + + * Nikolai Weibull: 28911: Completion/Unix/Command/_git: Only show + modified files for git-checkout without tree. 2011-03-16 Frank Terbeck <ft@bewatermyfriend.org> @@ -14352,5 +14355,5 @@ ***************************************************** * This is used by the shell to define $ZSH_PATCHLEVEL -* $Revision: 1.5225 $ +* $Revision: 1.5226 $ ***************************************************** diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git index 3694d4aac..8a590be7f 100644 --- a/Completion/Unix/Command/_git +++ b/Completion/Unix/Command/_git @@ -396,7 +396,7 @@ _git-checkout () { # TODO: Allow A...B local branch_arg='branches::__git_revisions' \ tree_ish_arg='tree-ishs::__git_tree_ishs' \ - file_arg='files::__git_cached_files' + file_arg='modified-files::__git_modified_files' if [[ -n ${opt_args[(I)-b|-B|--orphan]} ]]; then tree_ish_arg= @@ -418,7 +418,7 @@ _git-checkout () { elif [[ -n $line[1] ]] && __git_is_treeish $line[1]; then __git_ignore_line __git_tree_files ${PREFIX:-.} $line[1] && ret=0 else - __git_ignore_line __git_cached_files && ret=0 + __git_ignore_line __git_modified_files && ret=0 fi ;; esac |