Browse Source

Update bash completion with new 1.5.3 command line options

A number of commands have learned new tricks as part of git 1.5.3.
If these are long options (--foo) we tend to support them in the
bash completion, as it makes the user's task of using the option
slightly easier.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
maint
Shawn O. Pearce 18 years ago
parent
commit
47e98eecf3
  1. 32
      contrib/completion/git-completion.bash

32
contrib/completion/git-completion.bash

@ -419,7 +419,7 @@ _git_add ()
local cur="${COMP_WORDS[COMP_CWORD]}" local cur="${COMP_WORDS[COMP_CWORD]}"
case "$cur" in case "$cur" in
--*) --*)
__gitcomp "--interactive" __gitcomp "--interactive --refresh"
return return
esac esac
COMPREPLY=() COMPREPLY=()
@ -573,6 +573,7 @@ _git_format_patch ()
--stdout --attach --thread --stdout --attach --thread
--output-directory --output-directory
--numbered --start-number --numbered --start-number
--numbered-files
--keep-subject --keep-subject
--signoff --signoff
--in-reply-to= --in-reply-to=
@ -590,7 +591,7 @@ _git_gc ()
local cur="${COMP_WORDS[COMP_CWORD]}" local cur="${COMP_WORDS[COMP_CWORD]}"
case "$cur" in case "$cur" in
--*) --*)
__gitcomp "--prune" __gitcomp "--prune --aggressive"
return return
;; ;;
esac esac
@ -617,14 +618,20 @@ _git_log ()
" "" "${cur##--pretty=}" " "" "${cur##--pretty=}"
return return
;; ;;
--date=*)
__gitcomp "
relative iso8601 rfc2822 short local default
" "" "${cur##--date=}"
return
;;
--*) --*)
__gitcomp " __gitcomp "
--max-count= --max-age= --since= --after= --max-count= --max-age= --since= --after=
--min-age= --before= --until= --min-age= --before= --until=
--root --topo-order --date-order --reverse --root --topo-order --date-order --reverse
--no-merges --no-merges --follow
--abbrev-commit --abbrev= --abbrev-commit --abbrev=
--relative-date --relative-date --date=
--author= --committer= --grep= --author= --committer= --grep=
--all-match --all-match
--pretty= --name-status --name-only --raw --pretty= --name-status --name-only --raw
@ -796,7 +803,7 @@ _git_config ()
case "$cur" in case "$cur" in
--*) --*)
__gitcomp " __gitcomp "
--global --system --global --system --file=
--list --replace-all --list --replace-all
--get --get-all --get-regexp --get --get-all --get-regexp
--add --unset --unset-all --add --unset --unset-all
@ -839,6 +846,7 @@ _git_config ()
core.ignoreStat core.ignoreStat
core.preferSymlinkRefs core.preferSymlinkRefs
core.logAllRefUpdates core.logAllRefUpdates
core.loosecompression
core.repositoryFormatVersion core.repositoryFormatVersion
core.sharedRepository core.sharedRepository
core.warnAmbiguousRefs core.warnAmbiguousRefs
@ -870,6 +878,7 @@ _git_config ()
diff.renames diff.renames
fetch.unpackLimit fetch.unpackLimit
format.headers format.headers
format.subjectprefix
gitcvs.enabled gitcvs.enabled
gitcvs.logfile gitcvs.logfile
gitcvs.allbinary gitcvs.allbinary
@ -896,6 +905,10 @@ _git_config ()
merge.verbosity merge.verbosity
pack.window pack.window
pack.depth pack.depth
pack.windowMemory
pack.compression
pack.deltaCacheSize
pack.deltaCacheLimit
pull.octopus pull.octopus
pull.twohead pull.twohead
repack.useDeltaBaseOffset repack.useDeltaBaseOffset
@ -1024,7 +1037,14 @@ _git ()
if [ $c -eq $COMP_CWORD -a -z "$command" ]; then if [ $c -eq $COMP_CWORD -a -z "$command" ]; then
case "${COMP_WORDS[COMP_CWORD]}" in case "${COMP_WORDS[COMP_CWORD]}" in
--*=*) COMPREPLY=() ;; --*=*) COMPREPLY=() ;;
--*) __gitcomp "--git-dir= --bare --version --exec-path" ;; --*) __gitcomp "
--no-pager
--git-dir=
--bare
--version
--exec-path
"
;;
*) __gitcomp "$(__git_commands) $(__git_aliases)" ;; *) __gitcomp "$(__git_commands) $(__git_aliases)" ;;
esac esac
return return

Loading…
Cancel
Save