undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

submodule--helper: remove repeated code in sync_submodule()

Browse Source 
This part of `sync_submodule()` is doing the same thing that
`compute_submodule_clone_url()` is doing. Let's reuse that helper here.

Note that this change adds a small overhead where we allocate and free
the 'remote' twice, but that is a small price to pay for the higher
level of abstraction we get.

Signed-off-by: Atharva Raykar <raykar.ath@gmail.com>
Mentored-by: Christian Couder <christian.couder@gmail.com>
Mentored-by: Shourya Shukla <periperidip@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Atharva Raykar 2021-08-10 17:16:35 +05:30 committed by Junio C Hamano
parent ab6f23b751
commit 0c61041ed6
1 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
builtin/submodule--helper.c
View File

@ -1373,20 +1373,10 @@ static void sync_submodule(const char *path, const char *prefix,
if (sub && sub->url) { if (sub && sub->url) {
if (starts_with_dot_dot_slash(sub->url) || if (starts_with_dot_dot_slash(sub->url) ||
starts_with_dot_slash(sub->url)) { starts_with_dot_slash(sub->url)) {
char *remote_url, *up_path; char *up_path = get_up_path(path);
char *remote = get_default_remote(); sub_origin_url = compute_submodule_clone_url(sub->url, up_path, 1);
strbuf_addf(&sb, "remote.%s.url", remote); super_config_url = compute_submodule_clone_url(sub->url, NULL, 1);
if (git_config_get_string(sb.buf, &remote_url))
remote_url = xgetcwd();
up_path = get_up_path(path);
sub_origin_url = relative_url(remote_url, sub->url, up_path);
super_config_url = relative_url(remote_url, sub->url, NULL);
free(remote);
free(up_path); free(up_path);
free(remote_url);
} else { } else {
sub_origin_url = xstrdup(sub->url); sub_origin_url = xstrdup(sub->url);
super_config_url = xstrdup(sub->url); super_config_url = xstrdup(sub->url);