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

builtin/fetch.c: respect 'submodule.recurse' option

Browse Source 
Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Stefan Beller 2017-05-31 17:30:50 -07:00 committed by Junio C Hamano
parent 4e53d6a541
commit 58f4203e7d
2 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
builtin/fetch.c
View File

@ -73,6 +73,13 @@ static int git_fetch_config(const char *k, const char *v, void *cb)
fetch_prune_config = git_config_bool(k, v); fetch_prune_config = git_config_bool(k, v);
return 0; return 0;
} }
if (!strcmp(k, "submodule.recurse")) {
int r = git_config_bool(k, v) ?
RECURSE_SUBMODULES_ON : RECURSE_SUBMODULES_OFF;
recurse_submodules = r;
}
return git_default_config(k, v, cb); return git_default_config(k, v, cb);
} }

10
t/t5526-fetch-submodules.sh
View File

@ -71,6 +71,16 @@ test_expect_success "fetch --recurse-submodules recurses into submodules" '
test_i18ncmp expect.err actual.err test_i18ncmp expect.err actual.err
' '
test_expect_success "submodule.recurse option triggers recursive fetch" '
add_upstream_commit &&
(
cd downstream &&
git -c submodule.recurse fetch >../actual.out 2>../actual.err
) &&
test_must_be_empty actual.out &&
test_i18ncmp expect.err actual.err
'
test_expect_success "fetch --recurse-submodules -j2 has the same output behaviour" ' test_expect_success "fetch --recurse-submodules -j2 has the same output behaviour" '
add_upstream_commit && add_upstream_commit &&
( (