undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'pw/completion-stash'

Browse Source 
* pw/completion-stash:
  completion: update completion arguments for stash
This commit is contained in:
Junio C Hamano 2016-02-03 14:16:06 -08:00
commit ebcdd635c5
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
contrib/completion/git-completion.bash
View File

@ -2386,7 +2386,7 @@ _git_show_branch ()
_git_stash ()
{
local save_opts='--keep-index --no-keep-index --quiet --patch'
local save_opts='--all --keep-index --no-keep-index --quiet --patch --include-untracked'
local subcommands='save list show apply clear drop pop create branch'
local subcommand="$(__git_find_on_cmdline "$subcommands")"
if [ -z "$subcommand" ]; then
@ -2408,9 +2408,20 @@ _git_stash ()
apply,--*|pop,--*)
__gitcomp "--index --quiet"
;;
show,--*|drop,--*|branch,--*)
drop,--*)
__gitcomp "--quiet"
;;
show,*|apply,*|drop,*|pop,*|branch,*)
show,--*|branch,--*)
;;
branch,*)
if [ $cword -eq 3 ]; then
__gitcomp_nl "$(__git_refs)";
else
__gitcomp_nl "$(git --git-dir="$(__gitdir)" stash list \
| sed -n -e 's/:.*//p')"
fi
;;
show,*|apply,*|drop,*|pop,*)
__gitcomp_nl "$(git --git-dir="$(__gitdir)" stash list \
| sed -n -e 's/:.*//p')"
;;