Skip to content

Commit

Permalink
status: respect advice.statusHints for ahead/behind advice
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Jeff King authored and Junio C Hamano committed Dec 3, 2012
1 parent c190ced commit 491e307
Showing 1 changed file with 9 additions and 6 deletions.
15 changes: 9 additions & 6 deletions remote.c
Original file line number Diff line number Diff line change
Expand Up @@ -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, "
Expand All @@ -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"
Expand All @@ -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;
}
Expand Down

0 comments on commit 491e307

Please sign in to comment.