completion: introduce __git_find_subcommand

Let's have a function to get the current subcommand when completing
commands that follow the syntax:

    git <command> <subcommand>

As a convenience, let's allow an optional "default subcommand" to be
returned if none is found.

Signed-off-by: Rubén Justo <rjusto@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index d4f0e08f5850ead53a5a8ea4a6c7c990dc695e22..dc5f73a9f399a4a9fed4de01ef9bd37a662ec2b9 100644 (file)
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -554,6 +554,26 @@ __gitcomp_file ()
        true
 }
 
+# Find the current subcommand for commands that follow the syntax:
+#
+#    git <command> <subcommand>
+#
+# 1: List of possible subcommands.
+# 2: Optional subcommand to return when none is found.
+__git_find_subcommand ()
+{
+       local subcommand subcommands="$1" default_subcommand="$2"
+
+       for subcommand in $subcommands; do
+               if [ "$subcommand" = "${words[__git_cmd_idx+1]}" ]; then
+                       echo $subcommand
+                       return
+               fi
+       done
+
+       echo $default_subcommand
+}
+
 # Execute 'git ls-files', unless the --committable option is specified, in
 # which case it runs 'git diff-index' to find out the files that can be
 # committed.  It return paths relative to the directory specified in the first