From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 2 May 2012 04:12:25 +0000 (-0700)
Subject: Merge branch 'jl/maint-submodule-recurse-fetch' into maint
X-Git-Tag: v1.7.10.1~3
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/17f695b479546c691f797a5f1d153fbb3010fb2f?hp=089c0ca8b6b1375336477e5011619c18a59b83e3

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
---

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 ? '!' : '*',