development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-11-05 18:59:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

merge(s): apply consistent punctuation to "up to date" messages

Browse source 
Although the various "Already up to date" messages resulting from merge
attempts share identical phrasing, they use a mix of punctuation ranging
from "." to "!" and even "Yeeah!", which leads to extra work for
translators. Ease the job of translators by settling upon "." as
punctuation for all such messages.

While at it, take advantage of printf_ln() to further ease the
translation task so translators need not worry about line termination,
and fix a case of missing line termination in the (unused)
merge_ort_nonrecursive() function.

Suggested-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Eric Sunshine 2021-05-02 01:14:22 -04:00 committed by Junio C Hamano
parent 48bf2fa8ba
commit 80cde95eec
4 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
builtin/merge.c
View file

@ -1610,7 +1610,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
} }
} }
if (up_to_date) { if (up_to_date) {
finish_up_to_date(_("Already up to date. Yeeah!")); finish_up_to_date(_("Already up to date."));
goto done; goto done;
} }
} }

2
merge-ort-wrappers.c
View file

@ -30,7 +30,7 @@ int merge_ort_nonrecursive(struct merge_options *opt,
return -1; return -1;
if (oideq(&merge_base->object.oid, &merge->object.oid)) { if (oideq(&merge_base->object.oid, &merge->object.oid)) {
printf(_("Already up to date!")); printf_ln(_("Already up to date."));
return 1; return 1;
} }

2
merge-recursive.c
View file

@ -3432,7 +3432,7 @@ static int merge_trees_internal(struct merge_options *opt,
} }
if (oideq(&merge_base->object.oid, &merge->object.oid)) { if (oideq(&merge_base->object.oid, &merge->object.oid)) {
output(opt, 0, _("Already up to date!")); output(opt, 0, _("Already up to date."));
*result = head; *result = head;
return 1; return 1;
} }

2
notes-merge.c
View file

@ -628,7 +628,7 @@ int notes_merge(struct notes_merge_options *o,
if (oideq(&remote->object.oid, base_oid)) { if (oideq(&remote->object.oid, base_oid)) {
/* Already merged; result == local commit */ /* Already merged; result == local commit */
if (o->verbosity >= 2) if (o->verbosity >= 2)
printf("Already up to date!\n"); printf_ln("Already up to date.");
oidcpy(result_oid, &local->object.oid); oidcpy(result_oid, &local->object.oid);
goto found_result; goto found_result;
} }