Skip to content

Commit 80cde95

Browse files
sunshinecogitster
authored andcommitted
merge(s): apply consistent punctuation to "up to date" messages
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 <[email protected]> Signed-off-by: Eric Sunshine <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 48bf2fa commit 80cde95

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

builtin/merge.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1610,7 +1610,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
16101610
}
16111611
}
16121612
if (up_to_date) {
1613-
finish_up_to_date(_("Already up to date. Yeeah!"));
1613+
finish_up_to_date(_("Already up to date."));
16141614
goto done;
16151615
}
16161616
}

merge-ort-wrappers.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ int merge_ort_nonrecursive(struct merge_options *opt,
3030
return -1;
3131

3232
if (oideq(&merge_base->object.oid, &merge->object.oid)) {
33-
printf(_("Already up to date!"));
33+
printf_ln(_("Already up to date."));
3434
return 1;
3535
}
3636

merge-recursive.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3432,7 +3432,7 @@ static int merge_trees_internal(struct merge_options *opt,
34323432
}
34333433

34343434
if (oideq(&merge_base->object.oid, &merge->object.oid)) {
3435-
output(opt, 0, _("Already up to date!"));
3435+
output(opt, 0, _("Already up to date."));
34363436
*result = head;
34373437
return 1;
34383438
}

notes-merge.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -628,7 +628,7 @@ int notes_merge(struct notes_merge_options *o,
628628
if (oideq(&remote->object.oid, base_oid)) {
629629
/* Already merged; result == local commit */
630630
if (o->verbosity >= 2)
631-
printf("Already up to date!\n");
631+
printf_ln("Already up to date.");
632632
oidcpy(result_oid, &local->object.oid);
633633
goto found_result;
634634
}

0 commit comments

Comments
 (0)