зеркало из https://github.com/microsoft/git.git
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>
This commit is contained in:
Родитель
c190ced600
Коммит
491e3075a2
15
remote.c
15
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",
|
"Your branch is ahead of '%s' by %d commits.\n",
|
||||||
num_ours),
|
num_ours),
|
||||||
base, num_ours);
|
base, num_ours);
|
||||||
strbuf_addf(sb,
|
if (advice_status_hints)
|
||||||
_(" (use \"git push\" to publish your local commits)\n"));
|
strbuf_addf(sb,
|
||||||
|
_(" (use \"git push\" to publish your local commits)\n"));
|
||||||
} else if (!num_ours) {
|
} else if (!num_ours) {
|
||||||
strbuf_addf(sb,
|
strbuf_addf(sb,
|
||||||
Q_("Your branch is behind '%s' by %d commit, "
|
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",
|
"and can be fast-forwarded.\n",
|
||||||
num_theirs),
|
num_theirs),
|
||||||
base, num_theirs);
|
base, num_theirs);
|
||||||
strbuf_addf(sb,
|
if (advice_status_hints)
|
||||||
_(" (use \"git pull\" to update your local branch)\n"));
|
strbuf_addf(sb,
|
||||||
|
_(" (use \"git pull\" to update your local branch)\n"));
|
||||||
} else {
|
} else {
|
||||||
strbuf_addf(sb,
|
strbuf_addf(sb,
|
||||||
Q_("Your branch and '%s' have diverged,\n"
|
Q_("Your branch and '%s' have diverged,\n"
|
||||||
|
@ -1655,8 +1657,9 @@ int format_tracking_info(struct branch *branch, struct strbuf *sb)
|
||||||
"respectively.\n",
|
"respectively.\n",
|
||||||
num_theirs),
|
num_theirs),
|
||||||
base, num_ours, num_theirs);
|
base, num_ours, num_theirs);
|
||||||
strbuf_addf(sb,
|
if (advice_status_hints)
|
||||||
_(" (use \"git pull\" to merge the remote branch into yours)\n"));
|
strbuf_addf(sb,
|
||||||
|
_(" (use \"git pull\" to merge the remote branch into yours)\n"));
|
||||||
}
|
}
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
Загрузка…
Ссылка в новой задаче