diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-04-23 12:58:28 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-04-23 12:58:28 -0700 |
| commit | 987dbb86eccd57635423afd540bab38d9b786a2c (patch) | |
| tree | 40e354b08b437da96d47f3e0cb190ce943c89307 /builtin | |
| parent | Merge branch 'jc/maint-blame-minimal' (diff) | |
| parent | submodules: recursive fetch also checks new tags for submodule commits (diff) | |
| download | tgif-987dbb86eccd57635423afd540bab38d9b786a2c.tar.xz | |
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
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/fetch.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/builtin/fetch.c b/builtin/fetch.c index 65f5f9b72f..cfb43df4e8 100644 --- a/builtin/fetch.c +++ b/builtin/fetch.c @@ -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 ? '!' : '*', |