diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-12-03 09:27:29 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-12-03 09:28:43 -0800 |
| commit | 90ae9f259eb55adf54bec6442fe9e2fe223ef80c (patch) | |
| tree | 4fcc29ac4eff0a634a06f17078a8d0afe593503c | |
| parent | Update draft release notes to 1.8.1 (diff) | |
| parent | status: respect advice.statusHints for ahead/behind advice (diff) | |
| download | tgif-90ae9f259eb55adf54bec6442fe9e2fe223ef80c.tar.xz | |
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
| -rw-r--r-- | remote.c | 15 |
1 files changed, 9 insertions, 6 deletions
@@ -1633,8 +1633,9 @@ int format_tracking_info(struct branch *branch, struct strbuf *sb) "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 @@ int format_tracking_info(struct branch *branch, struct strbuf *sb) "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 @@ int format_tracking_info(struct branch *branch, struct strbuf *sb) "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; } |