Merge branch 'maint'

diff --git a/builtin/fetch.c b/builtin/fetch.c
index 0f80cf81855fd8801de5a5f0548686fb19ab5068..1c8cb62445a3dc7a0ff1ff6d2663faec1bced167 100644 (file)
--- a/builtin/fetch.c
+++ b/builtin/fetch.c
@@ -306,14 +306,14 @@ static int update_local_ref(struct ref *ref,
                } else if (!prefixcmp(name, "refs/heads/")) {
                        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);
                } else {
                        msg = "storing ref";
                        what = _("[new ref]");
                }
 
+               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 ? '!' : '*',
@@ -594,7 +594,7 @@ static void find_non_local_tags(struct transport *transport,
 
        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;
 
                /*