undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'mm/status-push-pull-advise'

Browse Source 
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
This commit is contained in:
Junio C Hamano 2012-12-03 09:27:29 -08:00
commit 90ae9f259e
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
remote.c
View File

@ -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;
} }