summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNguyễn Thái Ngọc Duy <pclouds@gmail.com>2016-05-03 07:12:30 +0700
committerJunio C Hamano <gitster@pobox.com>2016-05-06 12:52:58 -0700
commitf54bea44a58caddaaf83644d95172740e8490206 (patch)
treebfaaf6d4c884319c09fc7ca9c58e6422c42c8150
parente46579643d56162299b1756b70d418005351b256 (diff)
downloadgit-f54bea44a58caddaaf83644d95172740e8490206.tar.gz
remote.c: specify correct plural form in "commit diverge" messagend/remote-plural-ours-plus-theirs
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>
-rw-r--r--remote.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/remote.c b/remote.c
index ee6edfa335..21408463bb 100644
--- a/remote.c
+++ b/remote.c
@@ -2156,7 +2156,7 @@ int format_tracking_info(struct branch *branch, struct strbuf *sb)
"Your branch and '%s' have diverged,\n"
"and have %d and %d different commits each, "
"respectively.\n",
- theirs),
+ ours + theirs),
base, ours, theirs);
if (advice_status_hints)
strbuf_addf(sb,