mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-09-30 19:20:53 +02:00
Code Releases Activity

Mikael Magnusson: 25499: add function to validate tree-ishs.

Browse source
This commit is contained in:
Clint Adams 2008-08-21 12:25:18 +00:00
parent 7b559ca54a
commit 46c4588a2b
2 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ChangeLog
View file

@ -1,5 +1,8 @@
2008-08-21 Clint Adams <clint@zsh.org> 2008-08-21 Clint Adams <clint@zsh.org>
* Mikael Magnusson: 25499: Completion/Unix/Command/_git: add
function to validate tree-ishs.
* 25495: Completion/Unix/Command/_git: always complete cached files * 25495: Completion/Unix/Command/_git: always complete cached files
after git checkout --. after git checkout --.

9
Completion/Unix/Command/_git
View file

@ -1529,6 +1529,13 @@ _git-branch () {
} }
__git_zstyle_default ':completion::complete:git-branch:delete-argument-rest:*' ignore-line yes __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)"
[[ "$(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 # 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 # and perhaps also allow all that just with ^{tree} and so on. Not quite sure
# how to do that, though. # how to do that, though.
@ -1566,7 +1573,7 @@ _git-checkout () {
#What's the variable that holds the tree-ish argument? Is it even reliably possible? #What's the variable that holds the tree-ish argument? Is it even reliably possible?
case $state in case $state in
(files) (files)
if [[ -n $line[1] ]]; then if [[ -n $line[1] ]] && __git_is_treeish $line[1]; then
__git_tree_files . $line[1] && ret=0 __git_tree_files . $line[1] && ret=0
else else
__git_cached_files && ret=0 __git_cached_files && ret=0