From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 3 Dec 2012 17:27:29 +0000 (-0800)
Subject: Merge branch 'mm/status-push-pull-advise'
X-Git-Tag: v1.8.1-rc0~1
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/90ae9f259eb55adf54bec6442fe9e2fe223ef80c?hp=-c

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

90ae9f259eb55adf54bec6442fe9e2fe223ef80c
diff --combined remote.c
index b6a768e260,18dc8ec85e..6aa49c03df
--- a/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;
  }