mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-09-02 10:01:11 +02:00
Code Releases Activity

Frank Terbeck: 24455: Completion/Unix/Command/_git: handle git stashes.

Browse source
This commit is contained in:
Clint Adams 2008-08-16 00:22:00 +00:00
parent fcf8b81ec3
commit ac8d013c16
2 changed files with 66 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2008-08-16 Clint Adams <clint@zsh.org>
* Frank Terbeck: 24455: Completion/Unix/Command/_git: handle git
stashes.
2008-08-14 Clint Adams <clint@zsh.org>
* 25452: Completion/Unix/Command/_look: redirect stderr from look

61
Completion/Unix/Command/_git
View file

@ -166,6 +166,7 @@ _git_commands () {
'revert:revert existing commit'
'rm:remove files from the working tree and from the index'
'show-branch:show branches and their commits'
'stash:stash away changes to the working tree'
'status:show working-tree'\''s status'
'tag:create tag object signed with GPG'
'verify-tag:check GPG signature of a tag')
@ -1913,6 +1914,66 @@ _git-status () {
}
__git_zstyle_default ':completion::complete:git-status:argument-rest:*' ignore-line yes
(( $+functions[__git_stashes] )) ||
__git_stashes () {
local expl
declare -a st_list
st_list=(${${(f)"$(_call_program stashes git stash list 2>/dev/null)"}/: */})
__git_command_successful || return
_wanted tags expl stash-list compadd $* - $st_list
}
(( $+functions[_git-stash] )) ||
_git-stash () {
local expl
local -a stash_cmds
stash_cmds=(
apply:"restore the changes recorded in the stash"
branch:"branch off at the commit at which the stash was originally created"
clear:"remove all the stashed states"
drop:"remove a single stashed state from the stash list"
list:"list the stashes that you currently have"
pop:"remove and apply a single stashed state from the stash list"
save:"save your local modifications to a new stash"
show:"show the changes recorded in the stash as a diff"
)
if (( CURRENT == 2 )); then
_describe -t command "git-stash commands" stash_cmds && ret=0
else
case $words[2] in
(apply)
_arguments \
'--index[try to reinstate the index'\''s changes too]' \
'*:stash:__git_stashes' && ret=0
;;
(branch)
_arguments \
'2:branch name:' \
'*:stash:__git_stashes' && ret=0
;;
(drop|pop|show)
_arguments \
'*:stash:__git_stashes' && ret=0
;;
(save)
_arguments \
'--keep-index[all changes already added to the index are left intact]' \
'*: :->end' && ret=0
[[ $state == 'end' ]] && _message 'message'
;;
(*)
_nothing
;;
esac
fi
}
(( $+functions[_git-verify-tag] )) ||
_git-verify-tag () {
_arguments \