summaryrefslogtreecommitdiff
path: root/remote.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-12-03 09:27:29 -0800
committerJunio C Hamano <gitster@pobox.com>2012-12-03 09:28:43 -0800
commit90ae9f259eb55adf54bec6442fe9e2fe223ef80c (patch)
tree4fcc29ac4eff0a634a06f17078a8d0afe593503c /remote.c
parentf94c3251e1400c3cf349f7f84fea4db66b540113 (diff)
parent491e3075a29a0475984098a85cdbbb185d5a1e33 (diff)
downloadgit-90ae9f259eb55adf54bec6442fe9e2fe223ef80c.tar.gz
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
Diffstat (limited to 'remote.c')
-rw-r--r--remote.c15
1 files changed, 9 insertions, 6 deletions
diff --git a/remote.c b/remote.c
index b6a768e260..6aa49c03df 100644
--- a/remote.c
+++ b/remote.c
@@ -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;
}