diff options
| author | Jeff King <peff@peff.net> | 2012-12-03 06:16:57 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-12-03 17:10:47 (GMT) |
| commit | 491e3075a29a0475984098a85cdbbb185d5a1e33 (patch) | |
| tree | f8d5f8d54da44a04370533d128b412c63afcd3ec /remote.c | |
| parent | c190ced600223f0774f6ba33f608b1e1347e623e (diff) | |
| download | git-491e3075a29a0475984098a85cdbbb185d5a1e33.zip git-491e3075a29a0475984098a85cdbbb185d5a1e33.tar.gz git-491e3075a29a0475984098a85cdbbb185d5a1e33.tar.bz2 | |
status: respect advice.statusHints for ahead/behind advice
If the user has unset advice.statusHints, we already
suppress the "use git reset to..." hints in each stanza. The
new "use git push to publish..." hint is the same type of
hint. Let's respect statusHints for it, rather than making
the user set yet another advice flag.
Signed-off-by: Jeff King <peff@peff.net>
Acked-by: Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'remote.c')
| -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; } |