submodule--helper: understand --checkout, --merge and --rebase synonyms

Understand --checkout, --merge and --rebase synonyms for
--update={checkout,merge,rebase}, as well as the short options that
'git submodule' itself understands.

This removes a difference between the CLI API of "git submodule" and
"git submodule--helper", making it easier to make the latter an alias
for the former. See 48308681b07 (git submodule update: have a
dedicated helper for cloning, 2016-02-29) for the initial addition of
--update.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c
index 04d2620fce8c2ca33d5fb15fb3c557677e8e0e2e..53179472d8531bf1082ec557120a2bf688401e6a 100644 (file)
--- a/builtin/submodule--helper.c
+++ b/builtin/submodule--helper.c
@@ -2404,6 +2404,23 @@ static void ensure_core_worktree(const char *path)
        }
 }
 
+static const char *submodule_update_type_to_label(enum submodule_update_type type)
+{
+       switch (type) {
+       case SM_UPDATE_CHECKOUT:
+               return "checkout";
+       case SM_UPDATE_MERGE:
+               return "merge";
+       case SM_UPDATE_REBASE:
+               return "rebase";
+       case SM_UPDATE_UNSPECIFIED:
+       case SM_UPDATE_NONE:
+       case SM_UPDATE_COMMAND:
+               break;
+       }
+       BUG("unreachable with type %d", type);
+}
+
 static void update_data_to_args(struct update_data *update_data, struct strvec *args)
 {
        strvec_pushl(args, "submodule--helper", "update", "--recursive", NULL);
@@ -2582,6 +2599,7 @@ static int module_update(int argc, const char **argv, const char *prefix)
        struct update_data opt = UPDATE_DATA_INIT;
        struct list_objects_filter_options filter_options;
        int ret;
+       enum submodule_update_type update_type = SM_UPDATE_UNSPECIFIED;
 
        struct option module_update_options[] = {
                OPT__FORCE(&opt.force, N_("force checkout updates"), 0),
@@ -2603,6 +2621,15 @@ static int module_update(int argc, const char **argv, const char *prefix)
                OPT_STRING(0, "update", &opt.update_default,
                           N_("string"),
                           N_("rebase, merge, checkout or none")),
+               OPT_SET_INT(0, "checkout", &update_type,
+                       N_("use the 'checkout' update strategy (default)"),
+                       SM_UPDATE_CHECKOUT),
+               OPT_SET_INT('m', "merge", &update_type,
+                       N_("use the 'merge' update strategy"),
+                       SM_UPDATE_MERGE),
+               OPT_SET_INT('r', "rebase", &update_type,
+                       N_("use the 'rebase' update strategy"),
+                       SM_UPDATE_REBASE),
                OPT_STRING_LIST(0, "reference", &opt.references, N_("repo"),
                           N_("reference repository")),
                OPT_BOOL(0, "dissociate", &opt.dissociate,
@@ -2652,6 +2679,9 @@ static int module_update(int argc, const char **argv, const char *prefix)
 
        opt.filter_options = &filter_options;
 
+       if (update_type != SM_UPDATE_UNSPECIFIED)
+               opt.update_default = submodule_update_type_to_label(update_type);
+
        if (opt.update_default)
                if (parse_submodule_update_strategy(opt.update_default,
                                                    &opt.update_strategy) < 0)

diff --git a/git-submodule.sh b/git-submodule.sh
index 1c1dc320922ed0d62379464ee7fcb501da7688ff..7fc7119fb21fa188c8de8377b289fc9b622d9fb8 100755 (executable)
--- a/git-submodule.sh
+++ b/git-submodule.sh
@@ -40,7 +40,9 @@ require_init=
 files=
 remote=
 nofetch=
-update=
+rebase=
+merge=
+checkout=
 custom_name=
 depth=
 progress=
@@ -260,7 +262,7 @@ cmd_update()
                        force=$1
                        ;;
                -r|--rebase)
-                       update="rebase"
+                       rebase=1
                        ;;
                --reference)
                        case "$2" in '') usage ;; esac
@@ -274,13 +276,13 @@ cmd_update()
                        dissociate=1
                        ;;
                -m|--merge)
-                       update="merge"
+                       merge=1
                        ;;
                --recursive)
                        recursive=1
                        ;;
                --checkout)
-                       update="checkout"
+                       checkout=1
                        ;;
                --recommend-shallow)
                        recommend_shallow="--recommend-shallow"
@@ -341,7 +343,9 @@ cmd_update()
                ${init:+--init} \
                ${nofetch:+--no-fetch} \
                ${wt_prefix:+--prefix "$wt_prefix"} \
-               ${update:+--update "$update"} \
+               ${rebase:+--rebase} \
+               ${merge:+--merge} \
+               ${checkout:+--checkout} \
                ${reference:+"$reference"} \
                ${dissociate:+"--dissociate"} \
                ${depth:+"$depth"} \