@matheusbsbs / matheus-bagliano / commits / d7a714fddc

submodule--helper update: use --super-prefix

Unlike the other subcommands, "git submodule--helper update" uses the "--recursive-prefix" flag instead of "--super-prefix". The two flags are otherwise identical (they only serve to compute the 'display path' of a submodule), except that there is a dedicated helper function to get the value of "--super-prefix". This inconsistency exists because "git submodule update" used to pass "--recursive-prefix" between shell and C (introduced in [1]) before "--super-prefix" was introduced (in [2]), and for simplicity, we kept this name when "git submodule--helper update" was created. Remove "--recursive-prefix" and its associated code from "git submodule--helper update", replacing it with "--super-prefix". To use "--super-prefix", module_update is marked with SUPPORT_SUPER_PREFIX. Note that module_clone must also be marked with SUPPORT_SUPER_PREFIX, otherwise the "git submodule--helper clone" subprocess will fail check because "--super-prefix" is propagated via the environment. [1] 48308681b0 (git submodule update: have a dedicated helper for cloning, 2016-02-29) [2] 74866d7579 (git: make super-prefix option, 2016-10-07) Signed-off-by: Glen Choo <chooglen@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Glen Choo committed Jun 30, 2022 at 19:11 UTC d7a714fddc2062fd21fbeec779fb3b9034fc21c2

1 file changed +10 -20

builtin/submodule--helper.c

+10 -20

@@ -477,22 +477,18 @@ static int starts_with_dot_dot_slash(const char *const path)

477

478 struct init_cb {

479 const char *prefix;

480 - const char *superprefix;

480 unsigned int flags;

481 };

482 #define INIT_CB_INIT { 0 }

483

484 static void init_submodule(const char *path, const char *prefix,

486 - const char *superprefix, unsigned int flags)

485 + unsigned int flags)

486 {

487 const struct submodule *sub;

488 struct strbuf sb = STRBUF_INIT;

489 char *upd = NULL, *url = NULL, *displaypath;

490

492 - /* try superprefix from the environment, if it is not passed explicitly */

493 - if (!superprefix)

494 - superprefix = get_super_prefix();

495 - displaypath = do_get_submodule_displaypath(path, prefix, superprefix);

491 + displaypath = do_get_submodule_displaypath(path, prefix, get_super_prefix());

492

493 sub = submodule_from_path(the_repository, null_oid(), path);

494

@@ -566,7 +562,7 @@ static void init_submodule(const char *path, const char *prefix,

562 static void init_submodule_cb(const struct cache_entry *list_item, void *cb_data)

563 {

564 struct init_cb *info = cb_data;

569 - init_submodule(list_item->name, info->prefix, info->superprefix, info->flags);

565 + init_submodule(list_item->name, info->prefix, info->flags);

566 }

567

568 static int module_init(int argc, const char **argv, const char *prefix)

@@ -1878,7 +1874,6 @@ struct submodule_update_clone {

1874

1875 struct update_data {

1876 const char *prefix;

1881 - const char *recursive_prefix;

1877 const char *displaypath;

1878 enum submodule_update_type update_default;

1879 struct object_id suboid;

@@ -1949,7 +1944,7 @@ static int prepare_to_clone_next_submodule(const struct cache_entry *ce,

1944 char *key;

1945 struct update_data *ud = suc->update_data;

1946 char *displaypath = do_get_submodule_displaypath(ce->name, ud->prefix,

1952 - ud->recursive_prefix);

1947 + get_super_prefix());

1948 struct strbuf sb = STRBUF_INIT;

1949 int needs_cloning = 0;

1950 int need_free_url = 0;

@@ -2415,12 +2410,12 @@ static void update_data_to_args(struct update_data *update_data, struct strvec *

2410 {

2411 enum submodule_update_type update_type = update_data->update_default;

2412

2418 - strvec_pushl(args, "submodule--helper", "update", "--recursive", NULL);

2419 - strvec_pushf(args, "--jobs=%d", update_data->max_jobs);

2413 if (update_data->displaypath) {

2421 - strvec_push(args, "--recursive-prefix");

2414 + strvec_push(args, "--super-prefix");

2415 strvec_pushf(args, "%s/", update_data->displaypath);

2416 }

2417 + strvec_pushl(args, "submodule--helper", "update", "--recursive", NULL);

2418 + strvec_pushf(args, "--jobs=%d", update_data->max_jobs);

2419 if (update_data->quiet)

2420 strvec_push(args, "--quiet");

2421 if (update_data->force)

@@ -2468,7 +2463,7 @@ static int update_submodule(struct update_data *update_data)

2463

2464 update_data->displaypath = do_get_submodule_displaypath(update_data->sm_path,

2465 update_data->prefix,

2471 - update_data->recursive_prefix);

2466 + get_super_prefix());

2467

2468 determine_submodule_update_strategy(the_repository, update_data->just_cloned,

2469 update_data->sm_path, update_data->update_default,

@@ -2592,10 +2587,6 @@ static int module_update(int argc, const char **argv, const char *prefix)

2587 OPT_STRING(0, "prefix", &opt.prefix,

2588 N_("path"),

2589 N_("path into the working tree")),

2595 - OPT_STRING(0, "recursive-prefix", &opt.recursive_prefix,

2596 - N_("path"),

2597 - N_("path into the working tree, across nested "

2598 - "submodule boundaries")),

2590 OPT_SET_INT(0, "checkout", &opt.update_default,

2591 N_("use the 'checkout' update strategy (default)"),

2592 SM_UPDATE_CHECKOUT),

@@ -2681,7 +2672,6 @@ static int module_update(int argc, const char **argv, const char *prefix)

2672 module_list_active(&list);

2673

2674 info.prefix = opt.prefix;

2684 - info.superprefix = opt.recursive_prefix;

2675 if (opt.quiet)

2676 info.flags |= OPT_QUIET;

2677

@@ -3378,9 +3368,9 @@ struct cmd_struct {

3368 static struct cmd_struct commands[] = {

3369 {"list", module_list, 0},

3370 {"name", module_name, 0},

3381 - {"clone", module_clone, 0},

3371 + {"clone", module_clone, SUPPORT_SUPER_PREFIX},

3372 {"add", module_add, 0},

3383 - {"update", module_update, 0},

3373 + {"update", module_update, SUPPORT_SUPER_PREFIX},

3374 {"resolve-relative-url-test", resolve_relative_url_test, 0},

3375 {"foreach", module_foreach, SUPPORT_SUPER_PREFIX},

3376 {"init", module_init, 0},