mirrors/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-10-28 12:59:41 +01:00
Code Activity

Merge branch 'pd/bash-4-completion'

Browse source 
* pd/bash-4-completion:
  bash: simple reimplementation of _get_comp_words_by_ref
  bash: get --pretty=m<tab> completion to work with bash v4

Conflicts:
	contrib/completion/git-completion.bash
This commit is contained in:
Junio C Hamano 2010-12-22 14:40:55 -08:00
commit 02fedc0f48
1 changed files with 290 additions and 78 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

368
contrib/completion/git-completion.bash
View file

@ -327,11 +327,168 @@ __gitcomp_1 ()
done done
} }
# The following function is based on code from:
#
# bash_completion - programmable completion functions for bash 3.2+
#
# Copyright © 2006-2008, Ian Macdonald <ian@caliban.org>
# © 2009-2010, Bash Completion Maintainers
# <bash-completion-devel@lists.alioth.debian.org>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software Foundation,
# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
# The latest version of this software can be obtained here:
#
# http://bash-completion.alioth.debian.org/
#
# RELEASE: 2.x
# This function can be used to access a tokenized list of words
# on the command line:
#
# __git_reassemble_comp_words_by_ref '=:'
# if test "${words_[cword_-1]}" = -w
# then
# ...
# fi
#
# The argument should be a collection of characters from the list of
# word completion separators (COMP_WORDBREAKS) to treat as ordinary
# characters.
#
# This is roughly equivalent to going back in time and setting
# COMP_WORDBREAKS to exclude those characters. The intent is to
# make option types like --date=<type> and <rev>:<path> easy to
# recognize by treating each shell word as a single token.
#
# It is best not to set COMP_WORDBREAKS directly because the value is
# shared with other completion scripts. By the time the completion
# function gets called, COMP_WORDS has already been populated so local
# changes to COMP_WORDBREAKS have no effect.
#
# Output: words_, cword_, cur_.
__git_reassemble_comp_words_by_ref()
{
local exclude i j first
# Which word separators to exclude?
exclude="${1//[^$COMP_WORDBREAKS]}"
cword_=$COMP_CWORD
if [ -z "$exclude" ]; then
words_=("${COMP_WORDS[@]}")
return
fi
# List of word completion separators has shrunk;
# re-assemble words to complete.
for ((i=0, j=0; i < ${#COMP_WORDS[@]}; i++, j++)); do
# Append each nonempty word consisting of just
# word separator characters to the current word.
first=t
while
[ $i -gt 0 ] &&
[ -n "${COMP_WORDS[$i]}" ] &&
# word consists of excluded word separators
[ "${COMP_WORDS[$i]//[^$exclude]}" = "${COMP_WORDS[$i]}" ]
do
# Attach to the previous token,
# unless the previous token is the command name.
if [ $j -ge 2 ] && [ -n "$first" ]; then
((j--))
fi
first=
words_[$j]=${words_[j]}${COMP_WORDS[i]}
if [ $i = $COMP_CWORD ]; then
cword_=$j
fi
if (($i < ${#COMP_WORDS[@]} - 1)); then
((i++))
else
# Done.
return
fi
done
words_[$j]=${words_[j]}${COMP_WORDS[i]}
if [ $i = $COMP_CWORD ]; then
cword_=$j
fi
done
}
if ! type _get_comp_words_by_ref >/dev/null 2>&1; then
if [[ -z ${ZSH_VERSION:+set} ]]; then
_get_comp_words_by_ref ()
{
local exclude cur_ words_ cword_
if [ "$1" = "-n" ]; then
exclude=$2
shift 2
fi
__git_reassemble_comp_words_by_ref "$exclude"
cur_=${words_[cword_]}
while [ $# -gt 0 ]; do
case "$1" in
cur)
cur=$cur_
;;
prev)
prev=${words_[$cword_-1]}
;;
words)
words=("${words_[@]}")
;;
cword)
cword=$cword_
;;
esac
shift
done
}
else
_get_comp_words_by_ref ()
{
while [ $# -gt 0 ]; do
case "$1" in
cur)
cur=${COMP_WORDS[COMP_CWORD]}
;;
prev)
prev=${COMP_WORDS[COMP_CWORD-1]}
;;
words)
words=("${COMP_WORDS[@]}")
;;
cword)
cword=$COMP_CWORD
;;
-n)
# assume COMP_WORDBREAKS is already set sanely
shift
;;
esac
shift
done
}
fi
fi
# __gitcomp accepts 1, 2, 3, or 4 arguments # __gitcomp accepts 1, 2, 3, or 4 arguments
# generates completion reply with compgen # generates completion reply with compgen
__gitcomp () __gitcomp ()
{ {
local cur="${COMP_WORDS[COMP_CWORD]}" local cur
_get_comp_words_by_ref -n =: cur
if [ $# -gt 2 ]; then if [ $# -gt 2 ]; then
cur="$3" cur="$3"
fi fi
@ -392,7 +549,8 @@ __git_tags ()
__git_refs () __git_refs ()
{ {
local i is_hash=y dir="$(__gitdir "${1-}")" track="${2-}" local i is_hash=y dir="$(__gitdir "${1-}")" track="${2-}"
local cur="${COMP_WORDS[COMP_CWORD]}" format refs local cur format refs
_get_comp_words_by_ref -n =: cur
if [ -d "$dir" ]; then if [ -d "$dir" ]; then
case "$cur" in case "$cur" in
refs|refs/*) refs|refs/*)
@ -506,7 +664,8 @@ __git_compute_merge_strategies ()
__git_complete_file () __git_complete_file ()
{ {
local pfx ls ref cur="${COMP_WORDS[COMP_CWORD]}" local pfx ls ref cur
_get_comp_words_by_ref -n =: cur
case "$cur" in case "$cur" in
?*:*) ?*:*)
ref="${cur%%:*}" ref="${cur%%:*}"
@ -554,7 +713,8 @@ __git_complete_file ()
__git_complete_revlist () __git_complete_revlist ()
{ {
local pfx cur="${COMP_WORDS[COMP_CWORD]}" local pfx cur
_get_comp_words_by_ref -n =: cur
case "$cur" in case "$cur" in
*...*) *...*)
pfx="${cur%...*}..." pfx="${cur%...*}..."
@ -574,11 +734,12 @@ __git_complete_revlist ()
__git_complete_remote_or_refspec () __git_complete_remote_or_refspec ()
{ {
local cmd="${COMP_WORDS[1]}" local cur words cword
local cur="${COMP_WORDS[COMP_CWORD]}" _get_comp_words_by_ref -n =: cur words cword
local cmd="${words[1]}"
local i c=2 remote="" pfx="" lhs=1 no_complete_refspec=0 local i c=2 remote="" pfx="" lhs=1 no_complete_refspec=0
while [ $c -lt $COMP_CWORD ]; do while [ $c -lt $cword ]; do
i="${COMP_WORDS[c]}" i="${words[c]}"
case "$i" in case "$i" in
--mirror) [ "$cmd" = "push" ] && no_complete_refspec=1 ;; --mirror) [ "$cmd" = "push" ] && no_complete_refspec=1 ;;
--all) --all)
@ -646,13 +807,14 @@ __git_complete_remote_or_refspec ()
__git_complete_strategy () __git_complete_strategy ()
{ {
local cur prev
_get_comp_words_by_ref -n =: cur prev
__git_compute_merge_strategies __git_compute_merge_strategies
case "${COMP_WORDS[COMP_CWORD-1]}" in case "$prev" in
-s|--strategy) -s|--strategy)
__gitcomp "$__git_merge_strategies" __gitcomp "$__git_merge_strategies"
return 0 return 0
esac esac
local cur="${COMP_WORDS[COMP_CWORD]}"
case "$cur" in case "$cur" in
--strategy=*) --strategy=*)
__gitcomp "$__git_merge_strategies" "" "${cur##--strategy=}" __gitcomp "$__git_merge_strategies" "" "${cur##--strategy=}"
@ -824,10 +986,10 @@ __git_aliased_command ()
# __git_find_on_cmdline requires 1 argument # __git_find_on_cmdline requires 1 argument
__git_find_on_cmdline () __git_find_on_cmdline ()
{ {
local word subcommand c=1 local word subcommand c=1 words cword
_get_comp_words_by_ref -n =: words cword
while [ $c -lt $COMP_CWORD ]; do while [ $c -lt $cword ]; do
word="${COMP_WORDS[c]}" word="${words[c]}"
for subcommand in $1; do for subcommand in $1; do
if [ "$subcommand" = "$word" ]; then if [ "$subcommand" = "$word" ]; then
echo "$subcommand" echo "$subcommand"
@ -840,9 +1002,10 @@ __git_find_on_cmdline ()
__git_has_doubledash () __git_has_doubledash ()
{ {
local c=1 local c=1 words cword
while [ $c -lt $COMP_CWORD ]; do _get_comp_words_by_ref -n =: words cword
if [ "--" = "${COMP_WORDS[c]}" ]; then while [ $c -lt $cword ]; do
if [ "--" = "${words[c]}" ]; then
return 0 return 0
fi fi
c=$((++c)) c=$((++c))
@ -854,7 +1017,8 @@ __git_whitespacelist="nowarn warn error error-all fix"
_git_am () _git_am ()
{ {
local cur="${COMP_WORDS[COMP_CWORD]}" dir="$(__gitdir)" local cur dir="$(__gitdir)"
_get_comp_words_by_ref -n =: cur
if [ -d "$dir"/rebase-apply ]; then if [ -d "$dir"/rebase-apply ]; then
__gitcomp "--skip --continue --resolved --abort" __gitcomp "--skip --continue --resolved --abort"
return return
@ -878,7 +1042,8 @@ _git_am ()
_git_apply () _git_apply ()
{ {
local cur="${COMP_WORDS[COMP_CWORD]}" local cur
_get_comp_words_by_ref -n =: cur
case "$cur" in case "$cur" in
--whitespace=*) --whitespace=*)
__gitcomp "$__git_whitespacelist" "" "${cur##--whitespace=}" __gitcomp "$__git_whitespacelist" "" "${cur##--whitespace=}"
@ -901,7 +1066,8 @@ _git_add ()
{ {
__git_has_doubledash && return __git_has_doubledash && return
local cur="${COMP_WORDS[COMP_CWORD]}" local cur
_get_comp_words_by_ref -n =: cur
case "$cur" in case "$cur" in
--*) --*)
__gitcomp " __gitcomp "
@ -915,7 +1081,8 @@ _git_add ()
_git_archive () _git_archive ()
{ {
local cur="${COMP_WORDS[COMP_CWORD]}" local cur
_get_comp_words_by_ref -n =: cur
case "$cur" in case "$cur" in
--format=*) --format=*)
__gitcomp "$(git archive --list)" "" "${cur##--format=}" __gitcomp "$(git archive --list)" "" "${cur##--format=}"
@ -963,10 +1130,11 @@ _git_bisect ()
_git_branch () _git_branch ()
{ {
local i c=1 only_local_ref="n" has_r="n" local i c=1 only_local_ref="n" has_r="n" cur words cword
while [ $c -lt $COMP_CWORD ]; do _get_comp_words_by_ref -n =: cur words cword
i="${COMP_WORDS[c]}" while [ $c -lt $cword ]; do
i="${words[c]}"
case "$i" in case "$i" in
-d|-m) only_local_ref="y" ;; -d|-m) only_local_ref="y" ;;
-r) has_r="y" ;; -r) has_r="y" ;;
@ -974,7 +1142,7 @@ _git_branch ()
c=$((++c)) c=$((++c))
done done
case "${COMP_WORDS[COMP_CWORD]}" in case "$cur" in
--*) --*)
__gitcomp " __gitcomp "
--color --no-color --verbose --abbrev= --no-abbrev --color --no-color --verbose --abbrev= --no-abbrev
@ -994,8 +1162,10 @@ _git_branch ()
_git_bundle () _git_bundle ()
{ {
local cmd="${COMP_WORDS[2]}" local words cword
case "$COMP_CWORD" in _get_comp_words_by_ref -n =: words cword
local cmd="${words[2]}"
case "$cword" in
2) 2)
__gitcomp "create list-heads verify unbundle" __gitcomp "create list-heads verify unbundle"
;; ;;
@ -1016,7 +1186,8 @@ _git_checkout ()
{ {
__git_has_doubledash && return __git_has_doubledash && return
local cur="${COMP_WORDS[COMP_CWORD]}" local cur
_get_comp_words_by_ref -n =: cur
case "$cur" in case "$cur" in
--conflict=*) --conflict=*)
__gitcomp "diff3 merge" "" "${cur##--conflict=}" __gitcomp "diff3 merge" "" "${cur##--conflict=}"
@ -1046,7 +1217,8 @@ _git_cherry ()
_git_cherry_pick () _git_cherry_pick ()
{ {
local cur="${COMP_WORDS[COMP_CWORD]}" local cur
_get_comp_words_by_ref -n =: cur
case "$cur" in case "$cur" in
--*) --*)
__gitcomp "--edit --no-commit" __gitcomp "--edit --no-commit"
@ -1061,7 +1233,8 @@ _git_clean ()
{ {
__git_has_doubledash && return __git_has_doubledash && return
local cur="${COMP_WORDS[COMP_CWORD]}" local cur
_get_comp_words_by_ref -n =: cur
case "$cur" in case "$cur" in
--*) --*)
__gitcomp "--dry-run --quiet" __gitcomp "--dry-run --quiet"
@ -1073,7 +1246,8 @@ _git_clean ()
_git_clone () _git_clone ()
{ {
local cur="${COMP_WORDS[COMP_CWORD]}" local cur
_get_comp_words_by_ref -n =: cur
case "$cur" in case "$cur" in
--*) --*)
__gitcomp " __gitcomp "
@ -1100,7 +1274,8 @@ _git_commit ()
{ {
__git_has_doubledash && return __git_has_doubledash && return
local cur="${COMP_WORDS[COMP_CWORD]}" local cur
_get_comp_words_by_ref -n =: cur
case "$cur" in case "$cur" in
--cleanup=*) --cleanup=*)
__gitcomp "default strip verbatim whitespace __gitcomp "default strip verbatim whitespace
@ -1135,7 +1310,8 @@ _git_commit ()
_git_describe () _git_describe ()
{ {
local cur="${COMP_WORDS[COMP_CWORD]}" local cur
_get_comp_words_by_ref -n =: cur
case "$cur" in case "$cur" in
--*) --*)
__gitcomp " __gitcomp "
@ -1167,7 +1343,8 @@ _git_diff ()
{ {
__git_has_doubledash && return __git_has_doubledash && return
local cur="${COMP_WORDS[COMP_CWORD]}" local cur
_get_comp_words_by_ref -n =: cur
case "$cur" in case "$cur" in
--*) --*)
__gitcomp "--cached --staged --pickaxe-all --pickaxe-regex __gitcomp "--cached --staged --pickaxe-all --pickaxe-regex
@ -1188,7 +1365,8 @@ _git_difftool ()
{ {
__git_has_doubledash && return __git_has_doubledash && return
local cur="${COMP_WORDS[COMP_CWORD]}" local cur
_get_comp_words_by_ref -n =: cur
case "$cur" in case "$cur" in
--tool=*) --tool=*)
__gitcomp "$__git_mergetools_common kompare" "" "${cur##--tool=}" __gitcomp "$__git_mergetools_common kompare" "" "${cur##--tool=}"
@ -1213,7 +1391,8 @@ __git_fetch_options="
_git_fetch () _git_fetch ()
{ {
local cur="${COMP_WORDS[COMP_CWORD]}" local cur
_get_comp_words_by_ref -n =: cur
case "$cur" in case "$cur" in
--*) --*)
__gitcomp "$__git_fetch_options" __gitcomp "$__git_fetch_options"
@ -1225,7 +1404,8 @@ _git_fetch ()
_git_format_patch () _git_format_patch ()
{ {
local cur="${COMP_WORDS[COMP_CWORD]}" local cur
_get_comp_words_by_ref -n =: cur
case "$cur" in case "$cur" in
--thread=*) --thread=*)
__gitcomp " __gitcomp "
@ -1257,7 +1437,8 @@ _git_format_patch ()
_git_fsck () _git_fsck ()
{ {
local cur="${COMP_WORDS[COMP_CWORD]}" local cur
_get_comp_words_by_ref -n =: cur
case "$cur" in case "$cur" in
--*) --*)
__gitcomp " __gitcomp "
@ -1272,7 +1453,8 @@ _git_fsck ()
_git_gc () _git_gc ()
{ {
local cur="${COMP_WORDS[COMP_CWORD]}" local cur
_get_comp_words_by_ref -n =: cur
case "$cur" in case "$cur" in
--*) --*)
__gitcomp "--prune --aggressive" __gitcomp "--prune --aggressive"
@ -1291,7 +1473,8 @@ _git_grep ()
{ {
__git_has_doubledash && return __git_has_doubledash && return
local cur="${COMP_WORDS[COMP_CWORD]}" local cur
_get_comp_words_by_ref -n =: cur
case "$cur" in case "$cur" in
--*) --*)
__gitcomp " __gitcomp "
@ -1314,7 +1497,8 @@ _git_grep ()
_git_help () _git_help ()
{ {
local cur="${COMP_WORDS[COMP_CWORD]}" local cur
_get_comp_words_by_ref -n =: cur
case "$cur" in case "$cur" in
--*) --*)
__gitcomp "--all --info --man --web" __gitcomp "--all --info --man --web"
@ -1332,7 +1516,8 @@ _git_help ()
_git_init () _git_init ()
{ {
local cur="${COMP_WORDS[COMP_CWORD]}" local cur
_get_comp_words_by_ref -n =: cur
case "$cur" in case "$cur" in
--shared=*) --shared=*)
__gitcomp " __gitcomp "
@ -1352,7 +1537,8 @@ _git_ls_files ()
{ {
__git_has_doubledash && return __git_has_doubledash && return
local cur="${COMP_WORDS[COMP_CWORD]}" local cur
_get_comp_words_by_ref -n =: cur
case "$cur" in case "$cur" in
--*) --*)
__gitcomp "--cached --deleted --modified --others --ignored __gitcomp "--cached --deleted --modified --others --ignored
@ -1406,12 +1592,13 @@ _git_log ()
{ {
__git_has_doubledash && return __git_has_doubledash && return
local cur="${COMP_WORDS[COMP_CWORD]}"
local g="$(git rev-parse --git-dir 2>/dev/null)" local g="$(git rev-parse --git-dir 2>/dev/null)"
local merge="" local merge=""
if [ -f "$g/MERGE_HEAD" ]; then if [ -f "$g/MERGE_HEAD" ]; then
merge="--merge" merge="--merge"
fi fi
local cur
_get_comp_words_by_ref -n =: cur
case "$cur" in case "$cur" in
--pretty=*) --pretty=*)
__gitcomp "$__git_log_pretty_formats $(__git_pretty_aliases) __gitcomp "$__git_log_pretty_formats $(__git_pretty_aliases)
@ -1465,7 +1652,8 @@ _git_merge ()
{ {
__git_complete_strategy && return __git_complete_strategy && return
local cur="${COMP_WORDS[COMP_CWORD]}" local cur
_get_comp_words_by_ref -n =: cur
case "$cur" in case "$cur" in
--*) --*)
__gitcomp "$__git_merge_options" __gitcomp "$__git_merge_options"
@ -1476,7 +1664,8 @@ _git_merge ()
_git_mergetool () _git_mergetool ()
{ {
local cur="${COMP_WORDS[COMP_CWORD]}" local cur
_get_comp_words_by_ref -n =: cur
case "$cur" in case "$cur" in
--tool=*) --tool=*)
__gitcomp "$__git_mergetools_common tortoisemerge" "" "${cur##--tool=}" __gitcomp "$__git_mergetools_common tortoisemerge" "" "${cur##--tool=}"
@ -1497,7 +1686,8 @@ _git_merge_base ()
_git_mv () _git_mv ()
{ {
local cur="${COMP_WORDS[COMP_CWORD]}" local cur
_get_comp_words_by_ref -n =: cur
case "$cur" in case "$cur" in
--*) --*)
__gitcomp "--dry-run" __gitcomp "--dry-run"
@ -1516,14 +1706,15 @@ _git_notes ()
{ {
local subcommands='add append copy edit list prune remove show' local subcommands='add append copy edit list prune remove show'
local subcommand="$(__git_find_on_cmdline "$subcommands")" local subcommand="$(__git_find_on_cmdline "$subcommands")"
local cur="${COMP_WORDS[COMP_CWORD]}" local cur words cword
_get_comp_words_by_ref -n =: cur words cword
case "$subcommand,$cur" in case "$subcommand,$cur" in
,--*) ,--*)
__gitcomp '--ref' __gitcomp '--ref'
;; ;;
,*) ,*)
case "${COMP_WORDS[COMP_CWORD-1]}" in case "${words[cword-1]}" in
--ref) --ref)
__gitcomp "$(__git_refs)" __gitcomp "$(__git_refs)"
;; ;;
@ -1551,7 +1742,7 @@ _git_notes ()
prune,*) prune,*)
;; ;;
*) *)
case "${COMP_WORDS[COMP_CWORD-1]}" in case "${words[cword-1]}" in
-m|-F) -m|-F)
;; ;;
*) *)
@ -1566,7 +1757,8 @@ _git_pull ()
{ {
__git_complete_strategy && return __git_complete_strategy && return
local cur="${COMP_WORDS[COMP_CWORD]}" local cur
_get_comp_words_by_ref -n =: cur
case "$cur" in case "$cur" in
--*) --*)
__gitcomp " __gitcomp "
@ -1582,8 +1774,9 @@ _git_pull ()
_git_push () _git_push ()
{ {
local cur="${COMP_WORDS[COMP_CWORD]}" local cur prev
case "${COMP_WORDS[COMP_CWORD-1]}" in _get_comp_words_by_ref -n =: cur prev
case "$prev" in
--repo) --repo)
__gitcomp "$(__git_remotes)" __gitcomp "$(__git_remotes)"
return return
@ -1606,7 +1799,9 @@ _git_push ()
_git_rebase () _git_rebase ()
{ {
local cur="${COMP_WORDS[COMP_CWORD]}" dir="$(__gitdir)" local dir="$(__gitdir)"
local cur
_get_comp_words_by_ref -n =: cur
if [ -d "$dir"/rebase-apply ] || [ -d "$dir"/rebase-merge ]; then if [ -d "$dir"/rebase-apply ] || [ -d "$dir"/rebase-merge ]; then
__gitcomp "--continue --skip --abort" __gitcomp "--continue --skip --abort"
return return
@ -1648,7 +1843,8 @@ __git_send_email_suppresscc_options="author self cc bodycc sob cccmd body all"
_git_send_email () _git_send_email ()
{ {
local cur="${COMP_WORDS[COMP_CWORD]}" local cur
_get_comp_words_by_ref -n =: cur
case "$cur" in case "$cur" in
--confirm=*) --confirm=*)
__gitcomp " __gitcomp "
@ -1690,9 +1886,11 @@ _git_stage ()
__git_config_get_set_variables () __git_config_get_set_variables ()
{ {
local prevword word config_file= c=$COMP_CWORD local words cword
_get_comp_words_by_ref -n =: words cword
local prevword word config_file= c=$cword
while [ $c -gt 1 ]; do while [ $c -gt 1 ]; do
word="${COMP_WORDS[c]}" word="${words[c]}"
case "$word" in case "$word" in
--global|--system|--file=*) --global|--system|--file=*)
config_file="$word" config_file="$word"
@ -1720,9 +1918,9 @@ __git_config_get_set_variables ()
_git_config () _git_config ()
{ {
local cur="${COMP_WORDS[COMP_CWORD]}" local cur prev
local prv="${COMP_WORDS[COMP_CWORD-1]}" _get_comp_words_by_ref -n =: cur prev
case "$prv" in case "$prev" in
branch.*.remote) branch.*.remote)
__gitcomp "$(__git_remotes)" __gitcomp "$(__git_remotes)"
return return
@ -1732,13 +1930,13 @@ _git_config ()
return return
;; ;;
remote.*.fetch) remote.*.fetch)
local remote="${prv#remote.}" local remote="${prev#remote.}"
remote="${remote%.fetch}" remote="${remote%.fetch}"
__gitcomp "$(__git_refs_remotes "$remote")" __gitcomp "$(__git_refs_remotes "$remote")"
return return
;; ;;
remote.*.push) remote.*.push)
local remote="${prv#remote.}" local remote="${prev#remote.}"
remote="${remote%.push}" remote="${remote%.push}"
__gitcomp "$(git --git-dir="$(__gitdir)" \ __gitcomp "$(git --git-dir="$(__gitdir)" \
for-each-ref --format='%(refname):%(refname)' \ for-each-ref --format='%(refname):%(refname)' \
@ -2191,7 +2389,8 @@ _git_reset ()
{ {
__git_has_doubledash && return __git_has_doubledash && return
local cur="${COMP_WORDS[COMP_CWORD]}" local cur
_get_comp_words_by_ref -n =: cur
case "$cur" in case "$cur" in
--*) --*)
__gitcomp "--merge --mixed --hard --soft --patch" __gitcomp "--merge --mixed --hard --soft --patch"
@ -2203,7 +2402,8 @@ _git_reset ()
_git_revert () _git_revert ()
{ {
local cur="${COMP_WORDS[COMP_CWORD]}" local cur
_get_comp_words_by_ref -n =: cur
case "$cur" in case "$cur" in
--*) --*)
__gitcomp "--edit --mainline --no-edit --no-commit --signoff" __gitcomp "--edit --mainline --no-edit --no-commit --signoff"
@ -2217,7 +2417,8 @@ _git_rm ()
{ {
__git_has_doubledash && return __git_has_doubledash && return
local cur="${COMP_WORDS[COMP_CWORD]}" local cur
_get_comp_words_by_ref -n =: cur
case "$cur" in case "$cur" in
--*) --*)
__gitcomp "--cached --dry-run --ignore-unmatch --quiet" __gitcomp "--cached --dry-run --ignore-unmatch --quiet"
@ -2231,7 +2432,8 @@ _git_shortlog ()
{ {
__git_has_doubledash && return __git_has_doubledash && return
local cur="${COMP_WORDS[COMP_CWORD]}" local cur
_get_comp_words_by_ref -n =: cur
case "$cur" in case "$cur" in
--*) --*)
__gitcomp " __gitcomp "
@ -2249,7 +2451,8 @@ _git_show ()
{ {
__git_has_doubledash && return __git_has_doubledash && return
local cur="${COMP_WORDS[COMP_CWORD]}" local cur
_get_comp_words_by_ref -n =: cur
case "$cur" in case "$cur" in
--pretty=*) --pretty=*)
__gitcomp "$__git_log_pretty_formats $(__git_pretty_aliases) __gitcomp "$__git_log_pretty_formats $(__git_pretty_aliases)
@ -2273,7 +2476,8 @@ _git_show ()
_git_show_branch () _git_show_branch ()
{ {
local cur="${COMP_WORDS[COMP_CWORD]}" local cur
_get_comp_words_by_ref -n =: cur
case "$cur" in case "$cur" in
--*) --*)
__gitcomp " __gitcomp "
@ -2290,7 +2494,8 @@ _git_show_branch ()
_git_stash () _git_stash ()
{ {
local cur="${COMP_WORDS[COMP_CWORD]}" local cur
_get_comp_words_by_ref -n =: cur
local save_opts='--keep-index --no-keep-index --quiet --patch' local save_opts='--keep-index --no-keep-index --quiet --patch'
local subcommands='save list show apply clear drop pop create branch' local subcommands='save list show apply clear drop pop create branch'
local subcommand="$(__git_find_on_cmdline "$subcommands")" local subcommand="$(__git_find_on_cmdline "$subcommands")"
@ -2335,7 +2540,8 @@ _git_submodule ()
local subcommands="add status init update summary foreach sync" local subcommands="add status init update summary foreach sync"
if [ -z "$(__git_find_on_cmdline "$subcommands")" ]; then if [ -z "$(__git_find_on_cmdline "$subcommands")" ]; then
local cur="${COMP_WORDS[COMP_CWORD]}" local cur
_get_comp_words_by_ref -n =: cur
case "$cur" in case "$cur" in
--*) --*)
__gitcomp "--quiet --cached" __gitcomp "--quiet --cached"
@ -2379,7 +2585,8 @@ _git_svn ()
--edit --rmdir --find-copies-harder --copy-similarity= --edit --rmdir --find-copies-harder --copy-similarity=
" "
local cur="${COMP_WORDS[COMP_CWORD]}" local cur
_get_comp_words_by_ref -n =: cur
case "$subcommand,$cur" in case "$subcommand,$cur" in
fetch,--*) fetch,--*)
__gitcomp "--revision= --fetch-all $fc_opts" __gitcomp "--revision= --fetch-all $fc_opts"
@ -2451,8 +2658,10 @@ _git_svn ()
_git_tag () _git_tag ()
{ {
local i c=1 f=0 local i c=1 f=0
while [ $c -lt $COMP_CWORD ]; do local words cword prev
i="${COMP_WORDS[c]}" _get_comp_words_by_ref -n =: words cword prev
while [ $c -lt $cword ]; do
i="${words[c]}"
case "$i" in case "$i" in
-d|-v) -d|-v)
__gitcomp "$(__git_tags)" __gitcomp "$(__git_tags)"
@ -2465,7 +2674,7 @@ _git_tag ()
c=$((++c)) c=$((++c))
done done
case "${COMP_WORDS[COMP_CWORD-1]}" in case "$prev" in
-m|-F) -m|-F)
COMPREPLY=() COMPREPLY=()
;; ;;
@ -2496,8 +2705,10 @@ _git ()
setopt KSH_TYPESET setopt KSH_TYPESET
fi fi
while [ $c -lt $COMP_CWORD ]; do local cur words cword
i="${COMP_WORDS[c]}" _get_comp_words_by_ref -n =: cur words cword
while [ $c -lt $cword ]; do
i="${words[c]}"
case "$i" in case "$i" in
--git-dir=*) __git_dir="${i#--git-dir=}" ;; --git-dir=*) __git_dir="${i#--git-dir=}" ;;
--bare) __git_dir="." ;; --bare) __git_dir="." ;;
@ -2509,7 +2720,7 @@ _git ()
done done
if [ -z "$command" ]; then if [ -z "$command" ]; then
case "${COMP_WORDS[COMP_CWORD]}" in case "$cur" in
--*) __gitcomp " --*) __gitcomp "
--paginate --paginate
--no-pager --no-pager
@ -2547,12 +2758,13 @@ _gitk ()
__git_has_doubledash && return __git_has_doubledash && return
local cur="${COMP_WORDS[COMP_CWORD]}" local cur
local g="$(__gitdir)" local g="$(__gitdir)"
local merge="" local merge=""
if [ -f "$g/MERGE_HEAD" ]; then if [ -f "$g/MERGE_HEAD" ]; then
merge="--merge" merge="--merge"
fi fi
_get_comp_words_by_ref -n =: cur
case "$cur" in case "$cur" in
--*) --*)
__gitcomp " __gitcomp "