Browse Source

bash: rename __git_find_subcommand() to __git_find_on_cmdline()

__git_find_subcommand() was originally meant to check whether
subcommands are already present on the command line.  But the code is
general enough to be used for checking the presence of command line
options as well, and the next commit will use it for that purpose, so
let's give it a more general name.

Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
Acked-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
SZEDER Gábor 16 years ago committed by Junio C Hamano
parent
commit
918c03c2a7
  1. 14
      contrib/completion/git-completion.bash

14
contrib/completion/git-completion.bash

@ -620,8 +620,8 @@ __git_aliased_command () @@ -620,8 +620,8 @@ __git_aliased_command ()
done
}

# __git_find_subcommand requires 1 argument
__git_find_subcommand ()
# __git_find_on_cmdline requires 1 argument
__git_find_on_cmdline ()
{
local word subcommand c=1

@ -740,7 +740,7 @@ _git_bisect () @@ -740,7 +740,7 @@ _git_bisect ()
__git_has_doubledash && return

local subcommands="start bad good skip reset visualize replay log run"
local subcommand="$(__git_find_subcommand "$subcommands")"
local subcommand="$(__git_find_on_cmdline "$subcommands")"
if [ -z "$subcommand" ]; then
__gitcomp "$subcommands"
return
@ -1749,7 +1749,7 @@ _git_config () @@ -1749,7 +1749,7 @@ _git_config ()
_git_remote ()
{
local subcommands="add rename rm show prune update set-head"
local subcommand="$(__git_find_subcommand "$subcommands")"
local subcommand="$(__git_find_on_cmdline "$subcommands")"
if [ -z "$subcommand" ]; then
__gitcomp "$subcommands"
return
@ -1877,7 +1877,7 @@ _git_show_branch () @@ -1877,7 +1877,7 @@ _git_show_branch ()
_git_stash ()
{
local subcommands='save list show apply clear drop pop create branch'
local subcommand="$(__git_find_subcommand "$subcommands")"
local subcommand="$(__git_find_on_cmdline "$subcommands")"
if [ -z "$subcommand" ]; then
__gitcomp "$subcommands"
else
@ -1908,7 +1908,7 @@ _git_submodule () @@ -1908,7 +1908,7 @@ _git_submodule ()
__git_has_doubledash && return

local subcommands="add status init update summary foreach sync"
if [ -z "$(__git_find_subcommand "$subcommands")" ]; then
if [ -z "$(__git_find_on_cmdline "$subcommands")" ]; then
local cur="${COMP_WORDS[COMP_CWORD]}"
case "$cur" in
--*)
@ -1930,7 +1930,7 @@ _git_svn () @@ -1930,7 +1930,7 @@ _git_svn ()
proplist show-ignore show-externals branch tag blame
migrate
"
local subcommand="$(__git_find_subcommand "$subcommands")"
local subcommand="$(__git_find_on_cmdline "$subcommands")"
if [ -z "$subcommand" ]; then
__gitcomp "$subcommands"
else

Loading…
Cancel
Save