Shourya ShuklaConvert submodule subcommand 'set-url' to a builtin. Port 'set-url'to 'submodule--helper.c' and call the latter via 'git-submodule.sh'.
Signed-off-by: Shourya Shukla <shouryashukla.oo@gmail.com> --- Thank you Junio and Denton for the review :) Eliminated the whitespace errors and removed the callback structures as well. I have made the commit message more abstract for now as pointed out by Denton that the message seems to go into too much detail.
Also, the variable name for `&entry` has been changed to `config_entry` so as to avoid confusion with `cache_entry`. The shell file has also been amended.
builtin/submodule--helper.c | 46 +++++++++++++++++++++++++++++++++++++ git-submodule.sh | 22 +----------------- 2 files changed, 47 insertions(+), 21 deletions(-)
Show changes to 2 files +47 −21
builtin/submodule--helper.c, git-submodule.sh
diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c index 1a4b391c88..6fd459988e 100644 --- a/builtin/submodule--helper.c +++ b/builtin/submodule--helper.c @@ -2246,6 +2246,51 @@ static int module_config(int argc, const char **argv, const char *prefix) usage_with_options(git_submodule_helper_usage, module_config_options); } +static int module_set_url(int argc, const char **argv, const char *prefix) +{ + int quiet = 0; + + const char *newurl = NULL; + const char *path = NULL; + + struct strbuf config_entry = STRBUF_INIT; + + struct option set_url_options[] = { + OPT__QUIET(&quiet, N_("Suppress output for setting url of a submodule")), + OPT_END() + }; + + const char *const usage[] = { + N_("git submodule--helper set-url [--quiet] <path> <newurl>"), + NULL + }; + + argc = parse_options(argc, argv, prefix, set_url_options, + usage, 0); + + if (quiet) + quiet |= OPT_QUIET; + + if (argc!=2){ + usage_with_options(usage, set_url_options); + return 1; + } + + path = argv[0]; + newurl = argv[1]; + + strbuf_addstr(&config_entry, "submodule."); + strbuf_addstr(&config_entry, path); + strbuf_addstr(&config_entry, ".url"); + + config_set_in_gitmodules_file_gently(config_entry.buf, newurl); + sync_submodule(path, prefix, quiet); + + strbuf_release(&config_entry); + + return 0; +} + #define SUPPORT_SUPER_PREFIX (1<<0) struct cmd_struct { @@ -2276,6 +2321,7 @@ static struct cmd_struct commands[] = { {"is-active", is_active, 0}, {"check-name", check_name, 0}, {"config", module_config, 0}, + {"set-url", module_set_url, 0}, }; int cmd_submodule__helper(int argc, const char **argv, const char *prefix) diff --git a/git-submodule.sh b/git-submodule.sh index 08e0439df0..39ebdf25b5 100755 --- a/git-submodule.sh +++ b/git-submodule.sh @@ -805,27 +805,7 @@ cmd_set_url() { shift done - if test $# -ne 2 - then - usage - fi - - # we can't use `git submodule--helper name` here because internally, it - # hashes the path so a trailing slash could lead to an unintentional no match - name="$(git submodule--helper list "$1" | cut -f2)" - if test -z "$name" - then - exit 1 - fi - - url="$2" - if test -z "$url" - then - exit 1 - fi - - git submodule--helper config submodule."$name".url "$url" - git submodule--helper sync ${GIT_QUIET:+--quiet} "$name" + git ${wt_prefix:+-C "$wt_prefix"} ${prefix:+--super-prefix "$prefix"} submodule--helper set-url ${GIT_QUIET:+--quiet} -- "$@" } #
-- 2.26.2
