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

Teach bash about git-am/git-apply and their whitespace options.

Browse Source 
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Shawn O. Pearce 2006-11-27 15:12:03 -05:00 committed by Junio C Hamano
parent b51ec6bddb
commit 8832919515
1 changed files with 53 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -307,6 +307,54 @@ __git_aliased_command ()
done done
} }
__git_whitespacelist="nowarn warn error error-all strip"
_git_am ()
{
local cur="${COMP_WORDS[COMP_CWORD]}"
if [ -d .dotest ]; then
COMPREPLY=($(compgen -W "
--skip --resolved
" -- "$cur"))
return
fi
case "$cur" in
--whitespace=*)
COMPREPLY=($(compgen -W "$__git_whitespacelist" \
-- "${cur##--whitespace=}"))
return
;;
--*)
COMPREPLY=($(compgen -W "
--signoff --utf8 --binary --3way --interactive
--whitespace=
" -- "$cur"))
return
esac
COMPREPLY=()
}
_git_apply ()
{
local cur="${COMP_WORDS[COMP_CWORD]}"
case "$cur" in
--whitespace=*)
COMPREPLY=($(compgen -W "$__git_whitespacelist" \
-- "${cur##--whitespace=}"))
return
;;
--*)
COMPREPLY=($(compgen -W "
--stat --numstat --summary --check --index
--cached --index-info --reverse --reject --unidiff-zero
--apply --no-add --exclude=
--whitespace= --inaccurate-eof --verbose
" -- "$cur"))
return
esac
COMPREPLY=()
}
_git_branch () _git_branch ()
{ {
local cur="${COMP_WORDS[COMP_CWORD]}" local cur="${COMP_WORDS[COMP_CWORD]}"
@ -714,6 +762,8 @@ _git ()
[ "$expansion" ] && command="$expansion" [ "$expansion" ] && command="$expansion"
case "$command" in case "$command" in
am) _git_am ;;
apply) _git_apply ;;
branch) _git_branch ;; branch) _git_branch ;;
cat-file) _git_cat_file ;; cat-file) _git_cat_file ;;
checkout) _git_checkout ;; checkout) _git_checkout ;;
@ -748,6 +798,8 @@ _gitk ()
complete -o default -o nospace -F _git git complete -o default -o nospace -F _git git
complete -o default -F _gitk gitk complete -o default -F _gitk gitk
complete -o default -F _git_am git-am
complete -o default -F _git_apply git-apply
complete -o default -F _git_branch git-branch complete -o default -F _git_branch git-branch
complete -o default -o nospace -F _git_cat_file git-cat-file complete -o default -o nospace -F _git_cat_file git-cat-file
complete -o default -F _git_checkout git-checkout complete -o default -F _git_checkout git-checkout
@ -776,6 +828,7 @@ complete -o default -o nospace -F _git_log git-whatchanged
# included the '.exe' suffix. # included the '.exe' suffix.
# #
if [ Cygwin = "$(uname -o 2>/dev/null)" ]; then if [ Cygwin = "$(uname -o 2>/dev/null)" ]; then
complete -o default -F _git_apply git-apply.exe
complete -o default -o nospace -F _git git.exe complete -o default -o nospace -F _git git.exe
complete -o default -F _git_branch git-branch.exe complete -o default -F _git_branch git-branch.exe
complete -o default -o nospace -F _git_cat_file git-cat-file.exe complete -o default -o nospace -F _git_cat_file git-cat-file.exe