From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 20 Sep 2021 22:20:44 +0000 (-0700)
Subject: Merge branch 'ar/submodule-run-update-procedure'
X-Git-Tag: v2.34.0-rc0~146
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e78db9d3037eba812591857e7b44e69b97b329f4;p=thirdparty%2Fgit.git

Merge branch 'ar/submodule-run-update-procedure'

Reimplementation of parts of "git submodule" in C continues.

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

e78db9d3037eba812591857e7b44e69b97b329f4
diff --cc builtin/submodule--helper.c
index 77826ea9dd,80619361fc..f8fb70c826
--- a/builtin/submodule--helper.c
+++ b/builtin/submodule--helper.c
@@@ -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},