Merge branch 'mm/status-push-pull-advise'

Finishing touch to allow the new advice message squelched
with an advice.* configuration variable.

* mm/status-push-pull-advise:
status: respect advice.statusHints for ahead/behind advice

diff --combined remote.c
index b6a768e2605038ff4c85a0a115b8571013cc7d05,18dc8ec85ed23ec879f7bb2f526af6a1797d28c1..6aa49c03df13245486b20b04315437811b260882
--- 1/remote.c
--- 2/remote.c
+++ b/remote.c
@@@ -1458,8 -1458,8 +1458,8 @@@ int get_fetch_map(const struct ref *rem
  
        for (rmp = &ref_map; *rmp; ) {
                if ((*rmp)->peer_ref) {
 -                      if (check_refname_format((*rmp)->peer_ref->name + 5,
 -                              REFNAME_ALLOW_ONELEVEL)) {
 +                      if (prefixcmp((*rmp)->peer_ref->name, "refs/") ||
 +                          check_refname_format((*rmp)->peer_ref->name, 0)) {
                                struct ref *ignore = *rmp;
                                error("* Ignoring funny ref '%s' locally",
                                      (*rmp)->peer_ref->name);
@@@ -1633,8 -1633,9 +1633,9 @@@ int format_tracking_info(struct branch 
                           "Your branch is ahead of '%s' by %d commits.\n",
                           num_ours),
                        base, num_ours);
-               strbuf_addf(sb,
-                       _("  (use \"git push\" to publish your local commits)\n"));
+               if (advice_status_hints)
+                       strbuf_addf(sb,
+                               _("  (use \"git push\" to publish your local commits)\n"));
        } else if (!num_ours) {
                strbuf_addf(sb,
                        Q_("Your branch is behind '%s' by %d commit, "
@@@ -1643,8 -1644,9 +1644,9 @@@
                               "and can be fast-forwarded.\n",
                           num_theirs),
                        base, num_theirs);
-               strbuf_addf(sb,
-                       _("  (use \"git pull\" to update your local branch)\n"));
+               if (advice_status_hints)
+                       strbuf_addf(sb,
+                               _("  (use \"git pull\" to update your local branch)\n"));
        } else {
                strbuf_addf(sb,
                        Q_("Your branch and '%s' have diverged,\n"
@@@ -1655,8 -1657,9 +1657,9 @@@
                               "respectively.\n",
                           num_theirs),
                        base, num_ours, num_theirs);
-               strbuf_addf(sb,
-                       _("  (use \"git pull\" to merge the remote branch into yours)\n"));
+               if (advice_status_hints)
+                       strbuf_addf(sb,
+                               _("  (use \"git pull\" to merge the remote branch into yours)\n"));
        }
        return 1;
  }