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

Merge branch 'ap/trackinfo'

Browse Source 
* ap/trackinfo:
  Reword "your branch has diverged..." lines to reduce line length
This commit is contained in:
Junio C Hamano 2008-07-20 18:00:27 -07:00
commit 93310a40eb
1 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
remote.c
View File

@ -1308,34 +1308,28 @@ int stat_tracking_info(struct branch *branch, int *num_ours, int *num_theirs)
int format_tracking_info(struct branch *branch, struct strbuf *sb) int format_tracking_info(struct branch *branch, struct strbuf *sb)
{ {
int num_ours, num_theirs; int num_ours, num_theirs;
const char *base, *remote_msg; const char *base;
if (!stat_tracking_info(branch, &num_ours, &num_theirs)) if (!stat_tracking_info(branch, &num_ours, &num_theirs))
return 0; return 0;
base = branch->merge[0]->dst; base = branch->merge[0]->dst;
if (!prefixcmp(base, "refs/remotes/")) { if (!prefixcmp(base, "refs/remotes/")) {
remote_msg = " remote";
base += strlen("refs/remotes/"); base += strlen("refs/remotes/");
} else {
remote_msg = "";
} }
if (!num_theirs) if (!num_theirs)
strbuf_addf(sb, "Your branch is ahead of the tracked%s branch '%s' " strbuf_addf(sb, "Your branch is ahead of '%s' "
"by %d commit%s.\n", "by %d commit%s.\n",
remote_msg, base, base, num_ours, (num_ours == 1) ? "" : "s");
num_ours, (num_ours == 1) ? "" : "s");
else if (!num_ours) else if (!num_ours)
strbuf_addf(sb, "Your branch is behind the tracked%s branch '%s' " strbuf_addf(sb, "Your branch is behind '%s' "
"by %d commit%s,\n" "by %d commit%s, "
"and can be fast-forwarded.\n", "and can be fast-forwarded.\n",
remote_msg, base, base, num_theirs, (num_theirs == 1) ? "" : "s");
num_theirs, (num_theirs == 1) ? "" : "s");
else else
strbuf_addf(sb, "Your branch and the tracked%s branch '%s' " strbuf_addf(sb, "Your branch and '%s' have diverged,\n"
"have diverged,\nand respectively " "and have %d and %d different commit(s) each, "
"have %d and %d different commit(s) each.\n", "respectively.\n",
remote_msg, base, base, num_ours, num_theirs);
num_ours, num_theirs);
return 1; return 1;
} }