merge(3p/git): Merge git upstream at v2.26.2
This commit is contained in:
Vincent Ambo
commit
5229c9b232
1006 changed files with 149006 additions and 60819 deletions
|
|
@ -340,7 +340,7 @@ __gitcomp ()
|
|||
c="$c${4-}"
|
||||
if [[ $c == "$cur_"* ]]; then
|
||||
case $c in
|
||||
--*=*|*.) ;;
|
||||
--*=|*.) ;;
|
||||
*) c="$c " ;;
|
||||
esac
|
||||
COMPREPLY[i++]="${2-}$c"
|
||||
|
|
@ -360,7 +360,7 @@ __gitcomp ()
|
|||
c="$c${4-}"
|
||||
if [[ $c == "$cur_"* ]]; then
|
||||
case $c in
|
||||
--*=*|*.) ;;
|
||||
*=|*.) ;;
|
||||
*) c="$c " ;;
|
||||
esac
|
||||
COMPREPLY[i++]="${2-}$c"
|
||||
|
|
@ -524,7 +524,7 @@ __git_index_files ()
|
|||
# Even when a directory name itself does not contain
|
||||
# any special characters, it will still be quoted if
|
||||
# any of its (stripped) trailing path components do.
|
||||
# Because of this we may have seen the same direcory
|
||||
# Because of this we may have seen the same directory
|
||||
# both quoted and unquoted.
|
||||
if (p in paths)
|
||||
# We have seen the same directory unquoted,
|
||||
|
|
@ -550,7 +550,7 @@ __git_index_files ()
|
|||
esc_idx, 1)
|
||||
} else if (esc == "n") {
|
||||
# Uh-oh, a newline character.
|
||||
# We cant reliably put a pathname
|
||||
# We cannot reliably put a pathname
|
||||
# containing a newline into COMPREPLY,
|
||||
# and the newline would create a mess.
|
||||
# Skip this path.
|
||||
|
|
@ -565,7 +565,7 @@ __git_index_files ()
|
|||
}
|
||||
}
|
||||
# Drop closing double quote, if there is one.
|
||||
# (There isnt any if this is a directory, as it was
|
||||
# (There is not any if this is a directory, as it was
|
||||
# already stripped with the trailing path components.)
|
||||
if (substr(p, length(p), 1) == "\"")
|
||||
out = out substr(p, 1, length(p) - 1)
|
||||
|
|
@ -1069,15 +1069,32 @@ __git_aliased_command ()
|
|||
done
|
||||
}
|
||||
|
||||
# __git_find_on_cmdline requires 1 argument
|
||||
# Check whether one of the given words is present on the command line,
|
||||
# and print the first word found.
|
||||
#
|
||||
# Usage: __git_find_on_cmdline [<option>]... "<wordlist>"
|
||||
# --show-idx: Optionally show the index of the found word in the $words array.
|
||||
__git_find_on_cmdline ()
|
||||
{
|
||||
local word subcommand c=1
|
||||
local word c=1 show_idx
|
||||
|
||||
while test $# -gt 1; do
|
||||
case "$1" in
|
||||
--show-idx) show_idx=y ;;
|
||||
*) return 1 ;;
|
||||
esac
|
||||
shift
|
||||
done
|
||||
local wordlist="$1"
|
||||
|
||||
while [ $c -lt $cword ]; do
|
||||
word="${words[c]}"
|
||||
for subcommand in $1; do
|
||||
if [ "$subcommand" = "$word" ]; then
|
||||
echo "$subcommand"
|
||||
for word in $wordlist; do
|
||||
if [ "$word" = "${words[c]}" ]; then
|
||||
if [ -n "$show_idx" ]; then
|
||||
echo "$c $word"
|
||||
else
|
||||
echo "$word"
|
||||
fi
|
||||
return
|
||||
fi
|
||||
done
|
||||
|
|
@ -1180,6 +1197,7 @@ __git_count_arguments ()
|
|||
|
||||
__git_whitespacelist="nowarn warn error error-all fix"
|
||||
__git_patchformat="mbox stgit stgit-series hg mboxrd"
|
||||
__git_showcurrentpatch="diff raw"
|
||||
__git_am_inprogress_options="--skip --continue --resolved --abort --quit --show-current-patch"
|
||||
|
||||
_git_am ()
|
||||
|
|
@ -1198,6 +1216,10 @@ _git_am ()
|
|||
__gitcomp "$__git_patchformat" "" "${cur##--patch-format=}"
|
||||
return
|
||||
;;
|
||||
--show-current-patch=*)
|
||||
__gitcomp "$__git_showcurrentpatch" "" "${cur##--show-current-patch=}"
|
||||
return
|
||||
;;
|
||||
--*)
|
||||
__gitcomp_builtin am "" \
|
||||
"$__git_am_inprogress_options"
|
||||
|
|
@ -1250,10 +1272,7 @@ _git_archive ()
|
|||
return
|
||||
;;
|
||||
--*)
|
||||
__gitcomp "
|
||||
--format= --list --verbose
|
||||
--prefix= --remote= --exec= --output
|
||||
"
|
||||
__gitcomp_builtin archive "--format= --list --verbose --prefix= --worktree-attributes"
|
||||
return
|
||||
;;
|
||||
esac
|
||||
|
|
@ -1361,7 +1380,9 @@ _git_checkout ()
|
|||
esac
|
||||
}
|
||||
|
||||
__git_cherry_pick_inprogress_options="--continue --quit --abort"
|
||||
__git_sequencer_inprogress_options="--continue --quit --abort --skip"
|
||||
|
||||
__git_cherry_pick_inprogress_options=$__git_sequencer_inprogress_options
|
||||
|
||||
_git_cherry_pick ()
|
||||
{
|
||||
|
|
@ -1399,7 +1420,18 @@ _git_clean ()
|
|||
|
||||
_git_clone ()
|
||||
{
|
||||
case "$prev" in
|
||||
-c|--config)
|
||||
__git_complete_config_variable_name_and_value
|
||||
return
|
||||
;;
|
||||
esac
|
||||
case "$cur" in
|
||||
--config=*)
|
||||
__git_complete_config_variable_name_and_value \
|
||||
--cur="${cur##--config=}"
|
||||
return
|
||||
;;
|
||||
--*)
|
||||
__gitcomp_builtin clone
|
||||
return
|
||||
|
|
@ -1460,9 +1492,16 @@ __git_diff_algorithms="myers minimal patience histogram"
|
|||
|
||||
__git_diff_submodule_formats="diff log short"
|
||||
|
||||
__git_color_moved_opts="no default plain blocks zebra dimmed-zebra"
|
||||
|
||||
__git_color_moved_ws_opts="no ignore-space-at-eol ignore-space-change
|
||||
ignore-all-space allow-indentation-change"
|
||||
|
||||
__git_diff_common_options="--stat --numstat --shortstat --summary
|
||||
--patch-with-stat --name-only --name-status --color
|
||||
--no-color --color-words --no-renames --check
|
||||
--color-moved --color-moved= --no-color-moved
|
||||
--color-moved-ws= --no-color-moved-ws
|
||||
--full-index --binary --abbrev --diff-filter=
|
||||
--find-copies-harder --ignore-cr-at-eol
|
||||
--text --ignore-space-at-eol --ignore-space-change
|
||||
|
|
@ -1476,6 +1515,8 @@ __git_diff_common_options="--stat --numstat --shortstat --summary
|
|||
--dirstat-by-file= --cumulative
|
||||
--diff-algorithm=
|
||||
--submodule --submodule= --ignore-submodules
|
||||
--indent-heuristic --no-indent-heuristic
|
||||
--textconv --no-textconv
|
||||
"
|
||||
|
||||
_git_diff ()
|
||||
|
|
@ -1491,6 +1532,14 @@ _git_diff ()
|
|||
__gitcomp "$__git_diff_submodule_formats" "" "${cur##--submodule=}"
|
||||
return
|
||||
;;
|
||||
--color-moved=*)
|
||||
__gitcomp "$__git_color_moved_opts" "" "${cur##--color-moved=}"
|
||||
return
|
||||
;;
|
||||
--color-moved-ws=*)
|
||||
__gitcomp "$__git_color_moved_ws_opts" "" "${cur##--color-moved-ws=}"
|
||||
return
|
||||
;;
|
||||
--*)
|
||||
__gitcomp "--cached --staged --pickaxe-all --pickaxe-regex
|
||||
--base --ours --theirs --no-index
|
||||
|
|
@ -1737,7 +1786,7 @@ __git_log_shortlog_options="
|
|||
--all-match --invert-grep
|
||||
"
|
||||
|
||||
__git_log_pretty_formats="oneline short medium full fuller email raw format: mboxrd"
|
||||
__git_log_pretty_formats="oneline short medium full fuller reference email raw format: tformat: mboxrd"
|
||||
__git_log_date_formats="relative iso8601 iso8601-strict rfc2822 short local default raw unix format:"
|
||||
|
||||
_git_log ()
|
||||
|
|
@ -1784,6 +1833,10 @@ _git_log ()
|
|||
__gitcomp "$__git_diff_submodule_formats" "" "${cur##--submodule=}"
|
||||
return
|
||||
;;
|
||||
--no-walk=*)
|
||||
__gitcomp "sorted unsorted" "" "${cur##--no-walk=}"
|
||||
return
|
||||
;;
|
||||
--*)
|
||||
__gitcomp "
|
||||
$__git_log_common_options
|
||||
|
|
@ -1791,16 +1844,19 @@ _git_log ()
|
|||
$__git_log_gitk_options
|
||||
--root --topo-order --date-order --reverse
|
||||
--follow --full-diff
|
||||
--abbrev-commit --abbrev=
|
||||
--abbrev-commit --no-abbrev-commit --abbrev=
|
||||
--relative-date --date=
|
||||
--pretty= --format= --oneline
|
||||
--show-signature
|
||||
--cherry-mark
|
||||
--cherry-pick
|
||||
--graph
|
||||
--decorate --decorate=
|
||||
--decorate --decorate= --no-decorate
|
||||
--walk-reflogs
|
||||
--no-walk --no-walk= --do-walk
|
||||
--parents --children
|
||||
--expand-tabs --expand-tabs= --no-expand-tabs
|
||||
--patch
|
||||
$merge
|
||||
$__git_diff_common_options
|
||||
--pickaxe-all --pickaxe-regex
|
||||
|
|
@ -2004,15 +2060,18 @@ _git_range_diff ()
|
|||
__git_complete_revlist
|
||||
}
|
||||
|
||||
__git_rebase_inprogress_options="--continue --skip --abort --quit --show-current-patch"
|
||||
__git_rebase_interactive_inprogress_options="$__git_rebase_inprogress_options --edit-todo"
|
||||
|
||||
_git_rebase ()
|
||||
{
|
||||
__git_find_repo_path
|
||||
if [ -f "$__git_repo_path"/rebase-merge/interactive ]; then
|
||||
__gitcomp "--continue --skip --abort --quit --edit-todo --show-current-patch"
|
||||
__gitcomp "$__git_rebase_interactive_inprogress_options"
|
||||
return
|
||||
elif [ -d "$__git_repo_path"/rebase-apply ] || \
|
||||
[ -d "$__git_repo_path"/rebase-merge ]; then
|
||||
__gitcomp "--continue --skip --abort --quit --show-current-patch"
|
||||
__gitcomp "$__git_rebase_inprogress_options"
|
||||
return
|
||||
fi
|
||||
__git_complete_strategy && return
|
||||
|
|
@ -2021,20 +2080,13 @@ _git_rebase ()
|
|||
__gitcomp "$__git_whitespacelist" "" "${cur##--whitespace=}"
|
||||
return
|
||||
;;
|
||||
--onto=*)
|
||||
__git_complete_refs --cur="${cur##--onto=}"
|
||||
return
|
||||
;;
|
||||
--*)
|
||||
__gitcomp "
|
||||
--onto --merge --strategy --interactive
|
||||
--rebase-merges --preserve-merges --stat --no-stat
|
||||
--committer-date-is-author-date --ignore-date
|
||||
--ignore-whitespace --whitespace=
|
||||
--autosquash --no-autosquash
|
||||
--fork-point --no-fork-point
|
||||
--autostash --no-autostash
|
||||
--verify --no-verify
|
||||
--keep-empty --root --force-rebase --no-ff
|
||||
--rerere-autoupdate
|
||||
--exec
|
||||
"
|
||||
__gitcomp_builtin rebase "" \
|
||||
"$__git_rebase_interactive_inprogress_options"
|
||||
|
||||
return
|
||||
esac
|
||||
|
|
@ -2225,181 +2277,282 @@ __git_config_vars=
|
|||
__git_compute_config_vars ()
|
||||
{
|
||||
test -n "$__git_config_vars" ||
|
||||
__git_config_vars="$(git help --config-for-completion | sort | uniq)"
|
||||
__git_config_vars="$(git help --config-for-completion | sort -u)"
|
||||
}
|
||||
|
||||
_git_config ()
|
||||
# Completes possible values of various configuration variables.
|
||||
#
|
||||
# Usage: __git_complete_config_variable_value [<option>]...
|
||||
# --varname=<word>: The name of the configuration variable whose value is
|
||||
# to be completed. Defaults to the previous word on the
|
||||
# command line.
|
||||
# --cur=<word>: The current value to be completed. Defaults to the current
|
||||
# word to be completed.
|
||||
__git_complete_config_variable_value ()
|
||||
{
|
||||
local varname
|
||||
local varname="$prev" cur_="$cur"
|
||||
|
||||
while test $# != 0; do
|
||||
case "$1" in
|
||||
--varname=*) varname="${1##--varname=}" ;;
|
||||
--cur=*) cur_="${1##--cur=}" ;;
|
||||
*) return 1 ;;
|
||||
esac
|
||||
shift
|
||||
done
|
||||
|
||||
if [ "${BASH_VERSINFO[0]:-0}" -ge 4 ]; then
|
||||
varname="${prev,,}"
|
||||
varname="${varname,,}"
|
||||
else
|
||||
varname="$(echo "$prev" |tr A-Z a-z)"
|
||||
varname="$(echo "$varname" |tr A-Z a-z)"
|
||||
fi
|
||||
|
||||
case "$varname" in
|
||||
branch.*.remote|branch.*.pushremote)
|
||||
__gitcomp_nl "$(__git_remotes)"
|
||||
__gitcomp_nl "$(__git_remotes)" "" "$cur_"
|
||||
return
|
||||
;;
|
||||
branch.*.merge)
|
||||
__git_complete_refs
|
||||
__git_complete_refs --cur="$cur_"
|
||||
return
|
||||
;;
|
||||
branch.*.rebase)
|
||||
__gitcomp "false true merges preserve interactive"
|
||||
__gitcomp "false true merges preserve interactive" "" "$cur_"
|
||||
return
|
||||
;;
|
||||
remote.pushdefault)
|
||||
__gitcomp_nl "$(__git_remotes)"
|
||||
__gitcomp_nl "$(__git_remotes)" "" "$cur_"
|
||||
return
|
||||
;;
|
||||
remote.*.fetch)
|
||||
local remote="${prev#remote.}"
|
||||
local remote="${varname#remote.}"
|
||||
remote="${remote%.fetch}"
|
||||
if [ -z "$cur" ]; then
|
||||
if [ -z "$cur_" ]; then
|
||||
__gitcomp_nl "refs/heads/" "" "" ""
|
||||
return
|
||||
fi
|
||||
__gitcomp_nl "$(__git_refs_remotes "$remote")"
|
||||
__gitcomp_nl "$(__git_refs_remotes "$remote")" "" "$cur_"
|
||||
return
|
||||
;;
|
||||
remote.*.push)
|
||||
local remote="${prev#remote.}"
|
||||
local remote="${varname#remote.}"
|
||||
remote="${remote%.push}"
|
||||
__gitcomp_nl "$(__git for-each-ref \
|
||||
--format='%(refname):%(refname)' refs/heads)"
|
||||
--format='%(refname):%(refname)' refs/heads)" "" "$cur_"
|
||||
return
|
||||
;;
|
||||
pull.twohead|pull.octopus)
|
||||
__git_compute_merge_strategies
|
||||
__gitcomp "$__git_merge_strategies"
|
||||
return
|
||||
;;
|
||||
color.branch|color.diff|color.interactive|\
|
||||
color.showbranch|color.status|color.ui)
|
||||
__gitcomp "always never auto"
|
||||
__gitcomp "$__git_merge_strategies" "" "$cur_"
|
||||
return
|
||||
;;
|
||||
color.pager)
|
||||
__gitcomp "false true"
|
||||
__gitcomp "false true" "" "$cur_"
|
||||
return
|
||||
;;
|
||||
color.*.*)
|
||||
__gitcomp "
|
||||
normal black red green yellow blue magenta cyan white
|
||||
bold dim ul blink reverse
|
||||
"
|
||||
" "" "$cur_"
|
||||
return
|
||||
;;
|
||||
color.*)
|
||||
__gitcomp "false true always never auto" "" "$cur_"
|
||||
return
|
||||
;;
|
||||
diff.submodule)
|
||||
__gitcomp "$__git_diff_submodule_formats"
|
||||
__gitcomp "$__git_diff_submodule_formats" "" "$cur_"
|
||||
return
|
||||
;;
|
||||
help.format)
|
||||
__gitcomp "man info web html"
|
||||
__gitcomp "man info web html" "" "$cur_"
|
||||
return
|
||||
;;
|
||||
log.date)
|
||||
__gitcomp "$__git_log_date_formats"
|
||||
__gitcomp "$__git_log_date_formats" "" "$cur_"
|
||||
return
|
||||
;;
|
||||
sendemail.aliasfiletype)
|
||||
__gitcomp "mutt mailrc pine elm gnus"
|
||||
__gitcomp "mutt mailrc pine elm gnus" "" "$cur_"
|
||||
return
|
||||
;;
|
||||
sendemail.confirm)
|
||||
__gitcomp "$__git_send_email_confirm_options"
|
||||
__gitcomp "$__git_send_email_confirm_options" "" "$cur_"
|
||||
return
|
||||
;;
|
||||
sendemail.suppresscc)
|
||||
__gitcomp "$__git_send_email_suppresscc_options"
|
||||
__gitcomp "$__git_send_email_suppresscc_options" "" "$cur_"
|
||||
return
|
||||
;;
|
||||
sendemail.transferencoding)
|
||||
__gitcomp "7bit 8bit quoted-printable base64"
|
||||
return
|
||||
;;
|
||||
--get|--get-all|--unset|--unset-all)
|
||||
__gitcomp_nl "$(__git_config_get_set_variables)"
|
||||
__gitcomp "7bit 8bit quoted-printable base64" "" "$cur_"
|
||||
return
|
||||
;;
|
||||
*.*)
|
||||
return
|
||||
;;
|
||||
esac
|
||||
case "$cur" in
|
||||
--*)
|
||||
__gitcomp_builtin config
|
||||
return
|
||||
;;
|
||||
}
|
||||
|
||||
# Completes configuration sections, subsections, variable names.
|
||||
#
|
||||
# Usage: __git_complete_config_variable_name [<option>]...
|
||||
# --cur=<word>: The current configuration section/variable name to be
|
||||
# completed. Defaults to the current word to be completed.
|
||||
# --sfx=<suffix>: A suffix to be appended to each fully completed
|
||||
# configuration variable name (but not to sections or
|
||||
# subsections) instead of the default space.
|
||||
__git_complete_config_variable_name ()
|
||||
{
|
||||
local cur_="$cur" sfx
|
||||
|
||||
while test $# != 0; do
|
||||
case "$1" in
|
||||
--cur=*) cur_="${1##--cur=}" ;;
|
||||
--sfx=*) sfx="${1##--sfx=}" ;;
|
||||
*) return 1 ;;
|
||||
esac
|
||||
shift
|
||||
done
|
||||
|
||||
case "$cur_" in
|
||||
branch.*.*)
|
||||
local pfx="${cur%.*}." cur_="${cur##*.}"
|
||||
__gitcomp "remote pushRemote merge mergeOptions rebase" "$pfx" "$cur_"
|
||||
local pfx="${cur_%.*}."
|
||||
cur_="${cur_##*.}"
|
||||
__gitcomp "remote pushRemote merge mergeOptions rebase" "$pfx" "$cur_" "$sfx"
|
||||
return
|
||||
;;
|
||||
branch.*)
|
||||
local pfx="${cur%.*}." cur_="${cur#*.}"
|
||||
local pfx="${cur%.*}."
|
||||
cur_="${cur#*.}"
|
||||
__gitcomp_direct "$(__git_heads "$pfx" "$cur_" ".")"
|
||||
__gitcomp_nl_append $'autoSetupMerge\nautoSetupRebase\n' "$pfx" "$cur_"
|
||||
__gitcomp_nl_append $'autoSetupMerge\nautoSetupRebase\n' "$pfx" "$cur_" "$sfx"
|
||||
return
|
||||
;;
|
||||
guitool.*.*)
|
||||
local pfx="${cur%.*}." cur_="${cur##*.}"
|
||||
local pfx="${cur_%.*}."
|
||||
cur_="${cur_##*.}"
|
||||
__gitcomp "
|
||||
argPrompt cmd confirm needsFile noConsole noRescan
|
||||
prompt revPrompt revUnmerged title
|
||||
" "$pfx" "$cur_"
|
||||
" "$pfx" "$cur_" "$sfx"
|
||||
return
|
||||
;;
|
||||
difftool.*.*)
|
||||
local pfx="${cur%.*}." cur_="${cur##*.}"
|
||||
__gitcomp "cmd path" "$pfx" "$cur_"
|
||||
local pfx="${cur_%.*}."
|
||||
cur_="${cur_##*.}"
|
||||
__gitcomp "cmd path" "$pfx" "$cur_" "$sfx"
|
||||
return
|
||||
;;
|
||||
man.*.*)
|
||||
local pfx="${cur%.*}." cur_="${cur##*.}"
|
||||
__gitcomp "cmd path" "$pfx" "$cur_"
|
||||
local pfx="${cur_%.*}."
|
||||
cur_="${cur_##*.}"
|
||||
__gitcomp "cmd path" "$pfx" "$cur_" "$sfx"
|
||||
return
|
||||
;;
|
||||
mergetool.*.*)
|
||||
local pfx="${cur%.*}." cur_="${cur##*.}"
|
||||
__gitcomp "cmd path trustExitCode" "$pfx" "$cur_"
|
||||
local pfx="${cur_%.*}."
|
||||
cur_="${cur_##*.}"
|
||||
__gitcomp "cmd path trustExitCode" "$pfx" "$cur_" "$sfx"
|
||||
return
|
||||
;;
|
||||
pager.*)
|
||||
local pfx="${cur%.*}." cur_="${cur#*.}"
|
||||
local pfx="${cur_%.*}."
|
||||
cur_="${cur_#*.}"
|
||||
__git_compute_all_commands
|
||||
__gitcomp_nl "$__git_all_commands" "$pfx" "$cur_"
|
||||
__gitcomp_nl "$__git_all_commands" "$pfx" "$cur_" "$sfx"
|
||||
return
|
||||
;;
|
||||
remote.*.*)
|
||||
local pfx="${cur%.*}." cur_="${cur##*.}"
|
||||
local pfx="${cur_%.*}."
|
||||
cur_="${cur_##*.}"
|
||||
__gitcomp "
|
||||
url proxy fetch push mirror skipDefaultUpdate
|
||||
receivepack uploadpack tagOpt pushurl
|
||||
" "$pfx" "$cur_"
|
||||
" "$pfx" "$cur_" "$sfx"
|
||||
return
|
||||
;;
|
||||
remote.*)
|
||||
local pfx="${cur%.*}." cur_="${cur#*.}"
|
||||
local pfx="${cur_%.*}."
|
||||
cur_="${cur_#*.}"
|
||||
__gitcomp_nl "$(__git_remotes)" "$pfx" "$cur_" "."
|
||||
__gitcomp_nl_append "pushDefault" "$pfx" "$cur_"
|
||||
__gitcomp_nl_append "pushDefault" "$pfx" "$cur_" "$sfx"
|
||||
return
|
||||
;;
|
||||
url.*.*)
|
||||
local pfx="${cur%.*}." cur_="${cur##*.}"
|
||||
__gitcomp "insteadOf pushInsteadOf" "$pfx" "$cur_"
|
||||
local pfx="${cur_%.*}."
|
||||
cur_="${cur_##*.}"
|
||||
__gitcomp "insteadOf pushInsteadOf" "$pfx" "$cur_" "$sfx"
|
||||
return
|
||||
;;
|
||||
*.*)
|
||||
__git_compute_config_vars
|
||||
__gitcomp "$__git_config_vars"
|
||||
__gitcomp "$__git_config_vars" "" "$cur_" "$sfx"
|
||||
;;
|
||||
*)
|
||||
__git_compute_config_vars
|
||||
__gitcomp "$(echo "$__git_config_vars" | sed 's/\.[^ ]*/./g')"
|
||||
__gitcomp "$(echo "$__git_config_vars" |
|
||||
awk -F . '{
|
||||
sections[$1] = 1
|
||||
}
|
||||
END {
|
||||
for (s in sections)
|
||||
print s "."
|
||||
}
|
||||
')" "" "$cur_"
|
||||
;;
|
||||
esac
|
||||
}
|
||||
|
||||
# Completes '='-separated configuration sections/variable names and values
|
||||
# for 'git -c section.name=value'.
|
||||
#
|
||||
# Usage: __git_complete_config_variable_name_and_value [<option>]...
|
||||
# --cur=<word>: The current configuration section/variable name/value to be
|
||||
# completed. Defaults to the current word to be completed.
|
||||
__git_complete_config_variable_name_and_value ()
|
||||
{
|
||||
local cur_="$cur"
|
||||
|
||||
while test $# != 0; do
|
||||
case "$1" in
|
||||
--cur=*) cur_="${1##--cur=}" ;;
|
||||
*) return 1 ;;
|
||||
esac
|
||||
shift
|
||||
done
|
||||
|
||||
case "$cur_" in
|
||||
*=*)
|
||||
__git_complete_config_variable_value \
|
||||
--varname="${cur_%%=*}" --cur="${cur_#*=}"
|
||||
;;
|
||||
*)
|
||||
__git_complete_config_variable_name --cur="$cur_" --sfx='='
|
||||
;;
|
||||
esac
|
||||
}
|
||||
|
||||
_git_config ()
|
||||
{
|
||||
case "$prev" in
|
||||
--get|--get-all|--unset|--unset-all)
|
||||
__gitcomp_nl "$(__git_config_get_set_variables)"
|
||||
return
|
||||
;;
|
||||
*.*)
|
||||
__git_complete_config_variable_value
|
||||
return
|
||||
;;
|
||||
esac
|
||||
case "$cur" in
|
||||
--*)
|
||||
__gitcomp_builtin config
|
||||
;;
|
||||
*)
|
||||
__git_complete_config_variable_name
|
||||
;;
|
||||
esac
|
||||
}
|
||||
|
||||
|
|
@ -2512,7 +2665,7 @@ _git_restore ()
|
|||
esac
|
||||
}
|
||||
|
||||
__git_revert_inprogress_options="--continue --quit --abort"
|
||||
__git_revert_inprogress_options=$__git_sequencer_inprogress_options
|
||||
|
||||
_git_revert ()
|
||||
{
|
||||
|
|
@ -2580,8 +2733,9 @@ _git_show ()
|
|||
return
|
||||
;;
|
||||
--*)
|
||||
__gitcomp "--pretty= --format= --abbrev-commit --oneline
|
||||
--show-signature
|
||||
__gitcomp "--pretty= --format= --abbrev-commit --no-abbrev-commit
|
||||
--oneline --show-signature --patch
|
||||
--expand-tabs --expand-tabs= --no-expand-tabs
|
||||
$__git_diff_common_options
|
||||
"
|
||||
return
|
||||
|
|
@ -2601,6 +2755,27 @@ _git_show_branch ()
|
|||
__git_complete_revlist
|
||||
}
|
||||
|
||||
_git_sparse_checkout ()
|
||||
{
|
||||
local subcommands="list init set disable"
|
||||
local subcommand="$(__git_find_on_cmdline "$subcommands")"
|
||||
if [ -z "$subcommand" ]; then
|
||||
__gitcomp "$subcommands"
|
||||
return
|
||||
fi
|
||||
|
||||
case "$subcommand,$cur" in
|
||||
init,--*)
|
||||
__gitcomp "--cone"
|
||||
;;
|
||||
set,--*)
|
||||
__gitcomp "--stdin"
|
||||
;;
|
||||
*)
|
||||
;;
|
||||
esac
|
||||
}
|
||||
|
||||
_git_stash ()
|
||||
{
|
||||
local save_opts='--all --keep-index --no-keep-index --quiet --patch --include-untracked'
|
||||
|
|
@ -2666,7 +2841,7 @@ _git_submodule ()
|
|||
{
|
||||
__git_has_doubledash && return
|
||||
|
||||
local subcommands="add status init deinit update set-branch summary foreach sync absorbgitdirs"
|
||||
local subcommands="add status init deinit update set-branch set-url summary foreach sync absorbgitdirs"
|
||||
local subcommand="$(__git_find_on_cmdline "$subcommands")"
|
||||
if [ -z "$subcommand" ]; then
|
||||
case "$cur" in
|
||||
|
|
@ -2730,6 +2905,7 @@ _git_svn ()
|
|||
--log-window-size= --no-checkout --quiet
|
||||
--repack-flags --use-log-author --localtime
|
||||
--add-author-from
|
||||
--recursive
|
||||
--ignore-paths= --include-paths= $remote_opts
|
||||
"
|
||||
local init_opts="
|
||||
|
|
@ -2851,33 +3027,83 @@ _git_whatchanged ()
|
|||
_git_log
|
||||
}
|
||||
|
||||
__git_complete_worktree_paths ()
|
||||
{
|
||||
local IFS=$'\n'
|
||||
__gitcomp_nl "$(git worktree list --porcelain |
|
||||
# Skip the first entry: it's the path of the main worktree,
|
||||
# which can't be moved, removed, locked, etc.
|
||||
sed -n -e '2,$ s/^worktree //p')"
|
||||
}
|
||||
|
||||
_git_worktree ()
|
||||
{
|
||||
local subcommands="add list lock move prune remove unlock"
|
||||
local subcommand="$(__git_find_on_cmdline "$subcommands")"
|
||||
if [ -z "$subcommand" ]; then
|
||||
local subcommand subcommand_idx
|
||||
|
||||
subcommand="$(__git_find_on_cmdline --show-idx "$subcommands")"
|
||||
subcommand_idx="${subcommand% *}"
|
||||
subcommand="${subcommand#* }"
|
||||
|
||||
case "$subcommand,$cur" in
|
||||
,*)
|
||||
__gitcomp "$subcommands"
|
||||
else
|
||||
case "$subcommand,$cur" in
|
||||
add,--*)
|
||||
__gitcomp_builtin worktree_add
|
||||
;;
|
||||
*,--*)
|
||||
__gitcomp_builtin worktree_$subcommand
|
||||
;;
|
||||
add,*) # usage: git worktree add [<options>] <path> [<commit-ish>]
|
||||
# Here we are not completing an --option, it's either the
|
||||
# path or a ref.
|
||||
case "$prev" in
|
||||
-b|-B) # Complete refs for branch to be created/reseted.
|
||||
__git_complete_refs
|
||||
;;
|
||||
list,--*)
|
||||
__gitcomp_builtin worktree_list
|
||||
-*) # The previous word is an -o|--option without an
|
||||
# unstuck argument: have to complete the path for
|
||||
# the new worktree, so don't list anything, but let
|
||||
# Bash fall back to filename completion.
|
||||
;;
|
||||
lock,--*)
|
||||
__gitcomp_builtin worktree_lock
|
||||
;;
|
||||
prune,--*)
|
||||
__gitcomp_builtin worktree_prune
|
||||
;;
|
||||
remove,--*)
|
||||
__gitcomp "--force"
|
||||
;;
|
||||
*)
|
||||
*) # The previous word is not an --option, so it must
|
||||
# be either the 'add' subcommand, the unstuck
|
||||
# argument of an option (e.g. branch for -b|-B), or
|
||||
# the path for the new worktree.
|
||||
if [ $cword -eq $((subcommand_idx+1)) ]; then
|
||||
# Right after the 'add' subcommand: have to
|
||||
# complete the path, so fall back to Bash
|
||||
# filename completion.
|
||||
:
|
||||
else
|
||||
case "${words[cword-2]}" in
|
||||
-b|-B) # After '-b <branch>': have to
|
||||
# complete the path, so fall back
|
||||
# to Bash filename completion.
|
||||
;;
|
||||
*) # After the path: have to complete
|
||||
# the ref to be checked out.
|
||||
__git_complete_refs
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
;;
|
||||
lock,*|remove,*|unlock,*)
|
||||
__git_complete_worktree_paths
|
||||
;;
|
||||
move,*)
|
||||
if [ $cword -eq $((subcommand_idx+1)) ]; then
|
||||
# The first parameter must be an existing working
|
||||
# tree to be moved.
|
||||
__git_complete_worktree_paths
|
||||
else
|
||||
# The second parameter is the destination: it could
|
||||
# be any path, so don't list anything, but let Bash
|
||||
# fall back to filename completion.
|
||||
:
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
}
|
||||
|
||||
__git_complete_common () {
|
||||
|
|
@ -2956,7 +3182,11 @@ __git_main ()
|
|||
# Bash filename completion
|
||||
return
|
||||
;;
|
||||
-c|--namespace)
|
||||
-c)
|
||||
__git_complete_config_variable_name_and_value
|
||||
return
|
||||
;;
|
||||
--namespace)
|
||||
# we don't support completing these options' arguments
|
||||
return
|
||||
;;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue