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 <gitster@pobox.com>
Signed-off-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/merge.c b/builtin/merge.c
index 388619536aa1d250d6cad275b67974bbfdca28e4..3472a0ce3bff2b707e355c7241c387a0486b99c6 100644 (file)
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -1610,7 +1610,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
                        }
                }
                if (up_to_date) {
-                       finish_up_to_date(_("Already up to date. Yeeah!"));
+                       finish_up_to_date(_("Already up to date."));
                        goto done;
                }
        }

diff --git a/merge-ort-wrappers.c b/merge-ort-wrappers.c
index 7eec25f93a8571c9fa4cdb97334503f2961760a5..ad041061695223566ebfb2b9dacfc5aa7d215733 100644 (file)
--- a/merge-ort-wrappers.c
+++ b/merge-ort-wrappers.c
@@ -30,7 +30,7 @@ int merge_ort_nonrecursive(struct merge_options *opt,
                return -1;
 
        if (oideq(&merge_base->object.oid, &merge->object.oid)) {
-               printf(_("Already up to date!"));
+               printf_ln(_("Already up to date."));
                return 1;
        }
 

diff --git a/merge-recursive.c b/merge-recursive.c
index b69e694d986ac8f0a3e5f13f35ef81da474dade9..7e99431d664c61d275657571b3224afc57e1b8f6 100644 (file)
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -3432,7 +3432,7 @@ static int merge_trees_internal(struct merge_options *opt,
        }
 
        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;
                return 1;
        }

diff --git a/notes-merge.c b/notes-merge.c
index d2771fa3d43ced4980a9c94af2ee8d5f92caa168..321155fc87f565974c7eada794b78620f8856705 100644 (file)
--- a/notes-merge.c
+++ b/notes-merge.c
@@ -628,7 +628,7 @@ int notes_merge(struct notes_merge_options *o,
        if (oideq(&remote->object.oid, base_oid)) {
                /* Already merged; result == local commit */
                if (o->verbosity >= 2)
-                       printf("Already up to date!\n");
+                       printf_ln("Already up to date.");
                oidcpy(result_oid, &local->object.oid);
                goto found_result;
        }