]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'ar/submodule-run-update-procedure'
authorJunio C Hamano <gitster@pobox.com>
Mon, 20 Sep 2021 22:20:44 +0000 (15:20 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 20 Sep 2021 22:20:44 +0000 (15:20 -0700)
Reimplementation of parts of "git submodule" in C continues.

* ar/submodule-run-update-procedure:
  submodule--helper: run update procedures from C

1  2 
builtin/submodule--helper.c
git-submodule.sh

index 77826ea9dde004c24821899d2ed3804415d0dc04,80619361fc584f02c5e51022b149438d915add50..f8fb70c826cee2e56895f250051e7b30049d201b
@@@ -3095,11 -3204,13 +3351,12 @@@ static struct cmd_struct commands[] = 
        {"list", module_list, 0},
        {"name", module_name, 0},
        {"clone", module_clone, 0},
 -      {"add-clone", add_clone, 0},
 +      {"add", module_add, SUPPORT_SUPER_PREFIX},
        {"update-module-mode", module_update_module_mode, 0},
        {"update-clone", update_clone, 0},
+       {"run-update-procedure", run_update_procedure, 0},
        {"ensure-core-worktree", ensure_core_worktree, 0},
        {"relative-path", resolve_relative_path, 0},
 -      {"resolve-relative-url", resolve_relative_url, 0},
        {"resolve-relative-url-test", resolve_relative_url_test, 0},
        {"foreach", module_foreach, SUPPORT_SUPER_PREFIX},
        {"init", module_init, SUPPORT_SUPER_PREFIX},
Simple merge