mirrors/git
0
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-23 18:05:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'db/submodule-fetch-with-remote-name-fix'

Browse Source 
A "git fetch" from the superproject going down to a submodule used
a wrong remote when the default remote names are set differently
between them.

* db/submodule-fetch-with-remote-name-fix:
  submodule: correct remote name with fetch
This commit is contained in:
Taylor Blau 2024-10-25 14:01:09 -04:00
commit 6cbcc68ea7
2 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
builtin/submodule--helper.c
View File

@ -2333,7 +2333,14 @@ static int fetch_in_submodule(const char *module_path, int depth, int quiet,
strvec_pushf(&cp.args, "--depth=%d", depth); strvec_pushf(&cp.args, "--depth=%d", depth);
if (oid) { if (oid) {
char *hex = oid_to_hex(oid); char *hex = oid_to_hex(oid);
char *remote = get_default_remote(); char *remote;
int code;
code = get_default_remote_submodule(module_path, &remote);
if (code) {
child_process_clear(&cp);
return code;
}
strvec_pushl(&cp.args, remote, hex, NULL); strvec_pushl(&cp.args, remote, hex, NULL);
free(remote); free(remote);

20
t/t5572-pull-submodule.sh
View File

@ -230,6 +230,7 @@ test_expect_success 'branch has no merge base with remote-tracking counterpart'
test_create_repo a-submodule && test_create_repo a-submodule &&
test_commit -C a-submodule foo && test_commit -C a-submodule foo &&
test_commit -C a-submodule bar &&
test_create_repo parent && test_create_repo parent &&
git -C parent submodule add "$(pwd)/a-submodule" && git -C parent submodule add "$(pwd)/a-submodule" &&
@ -246,4 +247,23 @@ test_expect_success 'branch has no merge base with remote-tracking counterpart'
git -C child pull --recurse-submodules --rebase git -C child pull --recurse-submodules --rebase
' '
test_expect_success 'fetch submodule remote of different name from superproject' '
git -C child remote rename origin o1 &&
git -C child submodule update --init &&
# Needs to create unreachable commit from current master branch.
git -C a-submodule checkout -b newmain HEAD^ &&
test_commit -C a-submodule echo &&
test_commit -C a-submodule moreecho &&
subc=$(git -C a-submodule rev-parse --short HEAD) &&
git -C parent/a-submodule fetch &&
git -C parent/a-submodule checkout "$subc" &&
git -C parent commit -m "update submodule" a-submodule &&
git -C a-submodule reset --hard HEAD^^ &&
git -C child pull --no-recurse-submodules &&
git -C child submodule update
'
test_done test_done