diff options
| author | Frank Terbeck <bewater@users.sourceforge.net> | 2010-06-17 12:22:32 +0000 |
|---|---|---|
| committer | Frank Terbeck <bewater@users.sourceforge.net> | 2010-06-17 12:22:32 +0000 |
| commit | ce22f32bcbcc8df49a67cc22ea18d3691a701332 (patch) | |
| tree | 16cd2dea9f67a71d779bb9b276fe9ad763201410 /Completion/Unix/Command/_git | |
| parent | 28042: transpose-lines widget (diff) | |
| download | zsh-ce22f32bcbcc8df49a67cc22ea18d3691a701332.tar zsh-ce22f32bcbcc8df49a67cc22ea18d3691a701332.tar.gz zsh-ce22f32bcbcc8df49a67cc22ea18d3691a701332.tar.bz2 zsh-ce22f32bcbcc8df49a67cc22ea18d3691a701332.tar.lz zsh-ce22f32bcbcc8df49a67cc22ea18d3691a701332.tar.xz zsh-ce22f32bcbcc8df49a67cc22ea18d3691a701332.tar.zst zsh-ce22f32bcbcc8df49a67cc22ea18d3691a701332.zip | |
Holger Weiss: Completion/Unix/Command/_git: various fixes and enhancements.
Diffstat (limited to 'Completion/Unix/Command/_git')
| -rw-r--r-- | Completion/Unix/Command/_git | 71 |
1 files changed, 47 insertions, 24 deletions
diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git index e8ef1131a..465b31622 100644 --- a/Completion/Unix/Command/_git +++ b/Completion/Unix/Command/_git @@ -1597,13 +1597,6 @@ _git-branch () { } __git_zstyle_default ':completion::complete:git-branch:delete-argument-rest:*' ignore-line yes -(( $+functions[__git_is_treeish] )) || -__git_is_treeish () { - local sha1 - sha1="$(git rev-parse $1 -- 2> /dev/null)" && - [[ "$(git cat-file -t "${sha1}^{tree}" 2> /dev/null)" == tree ]] -} - # TODO: __git_tree_ishs is just stupid. It should be giving us a list of tags # and perhaps also allow all that just with ^{tree} and so on. Not quite sure # how to do that, though. @@ -1990,22 +1983,33 @@ _git-rerere () { (( $+functions[_git-reset] )) || _git-reset () { - local commit_arg path_arg + local curcontext=$curcontext state line |