mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jl/maint-submodule-recurse-fetch'

Browse Source 
"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
This commit is contained in:
Junio C Hamano
2012-04-23 12:58:28 -07:00
parent 9d76db4e67 a6801adc52
commit 987dbb86ec
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
builtin/fetch.c
View File

@ -300,11 +300,11 @@ static int update_local_ref(struct ref *ref,
else { else {
msg = "storing head"; msg = "storing head";
what = _("[new branch]"); 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); r = s_update_ref(msg, ref, 0);
strbuf_addf(display, "%c %-*s %-*s -> %s%s", strbuf_addf(display, "%c %-*s %-*s -> %s%s",
r ? '!' : '*', r ? '!' : '*',