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

remote.c: specify correct plural form in "commit diverge" message

Browse Source 
We need to count both "ours" and "theirs" commits when selecting plural
form for this message. Note that even though in this block, both ours
and theirs must be positive (i.e. can't be in singular form), we still
keep Q_(singular, plural) because languages other than English may have
more than one plural form.

Reported-by: Alfonsogonzalez, Ernesto (GE Digital) <ernesto.alfonsogonzalez@ge.com>
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Nguyễn Thái Ngọc Duy 2016-05-03 07:12:30 +07:00 committed by Junio C Hamano
parent e46579643d
commit f54bea44a5
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
remote.c
View File

@ -2156,7 +2156,7 @@ int format_tracking_info(struct branch *branch, struct strbuf *sb)
"Your branch and '%s' have diverged,\n" "Your branch and '%s' have diverged,\n"
"and have %d and %d different commits each, " "and have %d and %d different commits each, "
"respectively.\n", "respectively.\n",
theirs), ours + theirs),
base, ours, theirs); base, ours, theirs);
if (advice_status_hints) if (advice_status_hints)
strbuf_addf(sb, strbuf_addf(sb,