From: Junio C Hamano Date: Mon, 23 Apr 2012 19:58:28 +0000 (-0700) Subject: Merge branch 'jl/maint-submodule-recurse-fetch' X-Git-Tag: v1.7.11-rc0~122 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/987dbb86eccd57635423afd540bab38d9b786a2c?ds=inline;hp=-c Merge branch 'jl/maint-submodule-recurse-fetch' "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 --- 987dbb86eccd57635423afd540bab38d9b786a2c diff --combined builtin/fetch.c index 65f5f9b72f,996a4d6252..cfb43df4e8 --- a/builtin/fetch.c +++ b/builtin/fetch.c @@@ -300,11 -300,11 +300,11 @@@ static int update_local_ref(struct 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 ? '!' : '*', @@@ -585,7 -585,7 +585,7 @@@ static void find_non_local_tags(struct for_each_ref(add_existing, &existing_refs); for (ref = transport_get_remote_refs(transport); ref; ref = ref->next) { - if (prefixcmp(ref->name, "refs/tags")) + if (prefixcmp(ref->name, "refs/tags/")) continue; /*