Skip to content

Commit

Permalink
Merge branch 'jl/maint-submodule-recurse-fetch' into maint
Browse files Browse the repository at this point in the history
"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
  • Loading branch information
Junio C Hamano committed May 2, 2012
2 parents 089c0ca + a6801ad commit 17f695b
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions builtin/fetch.c
Original file line number Diff line number Diff line change
Expand Up @@ -300,11 +300,11 @@ static int update_local_ref(struct ref *ref,
else {
msg = "storing head";
what = _("[new branch]");
if ((recurse_submodules != RECURSE_SUBMODULES_OFF) &&
(recurse_submodules != RECURSE_SUBMODULES_ON))
check_for_new_submodule_commits(ref->new_sha1);
}

if ((recurse_submodules != RECURSE_SUBMODULES_OFF) &&
(recurse_submodules != RECURSE_SUBMODULES_ON))
check_for_new_submodule_commits(ref->new_sha1);
r = s_update_ref(msg, ref, 0);
strbuf_addf(display, "%c %-*s %-*s -> %s%s",
r ? '!' : '*',
Expand Down

0 comments on commit 17f695b

Please sign in to comment.