Skip to content

Commit 17f695b

Browse files
committed
Merge branch 'jl/maint-submodule-recurse-fetch' into maint
"git fetch" that recurses into submodules on demand did not check if it needs to go into submodules when non branches (most notably, tags) are fetched. By Jens Lehmann * jl/maint-submodule-recurse-fetch: submodules: recursive fetch also checks new tags for submodule commits
2 parents 089c0ca + a6801ad commit 17f695b

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

builtin/fetch.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -300,11 +300,11 @@ static int update_local_ref(struct ref *ref,
300300
else {
301301
msg = "storing head";
302302
what = _("[new branch]");
303-
if ((recurse_submodules != RECURSE_SUBMODULES_OFF) &&
304-
(recurse_submodules != RECURSE_SUBMODULES_ON))
305-
check_for_new_submodule_commits(ref->new_sha1);
306303
}
307304

305+
if ((recurse_submodules != RECURSE_SUBMODULES_OFF) &&
306+
(recurse_submodules != RECURSE_SUBMODULES_ON))
307+
check_for_new_submodule_commits(ref->new_sha1);
308308
r = s_update_ref(msg, ref, 0);
309309
strbuf_addf(display, "%c %-*s %-*s -> %s%s",
310310
r ? '!' : '*',

0 commit comments

Comments
 (0)