{"thread":{"id":"29501","subject":"[PATCH] i18n: git-commit whence_s \"merge/cherry-pick\" message","startedAt":"2012-02-01T17:20:30Z","lastAt":"2012-02-01T23:46:20Z","messageCount":2,"participants":["Jiang Xin","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"183483","messageId":"1328116830-61290-1-git-send-email-worldhello.net@gmail.com","threadId":"29501","inReplyTo":null,"subject":"[PATCH] i18n: git-commit whence_s \"merge/cherry-pick\" message","fromName":"Jiang Xin","fromEmail":"worldhello.net@gmail.com","sentAt":"2012-02-01T17:20:30Z","receivedAt":"2012-02-01T17:20:30Z","isPatch":true,"sender":{"key":"worldhello.net@gmail.com","avatar":"https://avatars.githubusercontent.com/u/183860?v=4"},"body":"Mark the \"merge/cherry-pick\" messages in whence_s for translation.\nThese messages returned from whence_s function are used as argument\nto build other messages.\n\nSigned-off-by: Jiang Xin <worldhello.net@gmail.com>\n---\n builtin/commit.c |    4 ++--\n 1 files changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/builtin/commit.c b/builtin/commit.c\nindex eba137..663e1 100644\n--- a/builtin/commit.c\n+++ b/builtin/commit.c\n@@ -202,10 +202,10 @@ static const char *whence_s(void)\n \tcase FROM_COMMIT:\n \t\tbreak;\n \tcase FROM_MERGE:\n-\t\ts = \"merge\";\n+\t\ts = _(\"merge\");\n \t\tbreak;\n \tcase FROM_CHERRY_PICK:\n-\t\ts = \"cherry-pick\";\n+\t\ts = _(\"cherry-pick\");\n \t\tbreak;\n \t}\n \n-- \n1.7.9.3.g1fbd7\n"},{"id":"183518","messageId":"7vpqdy15ir.fsf@alter.siamese.dyndns.org","threadId":"29501","inReplyTo":"1328116830-61290-1-git-send-email-worldhello.net@gmail.com","subject":"Re: [PATCH] i18n: git-commit whence_s \"merge/cherry-pick\" message","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2012-02-01T23:46:20Z","receivedAt":"2012-02-01T23:46:20Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Jiang Xin <worldhello.net@gmail.com> writes:\n\n> Mark the \"merge/cherry-pick\" messages in whence_s for translation.\n> These messages returned from whence_s function are used as argument\n> to build other messages.\n>\n> Signed-off-by: Jiang Xin <worldhello.net@gmail.com>\n> ---\n>  builtin/commit.c |    4 ++--\n>  1 files changed, 2 insertions(+), 2 deletions(-)\n>\n> diff --git a/builtin/commit.c b/builtin/commit.c\n> index eba137..663e1 100644\n> --- a/builtin/commit.c\n> +++ b/builtin/commit.c\n> @@ -202,10 +202,10 @@ static const char *whence_s(void)\n>  \tcase FROM_COMMIT:\n>  \t\tbreak;\n>  \tcase FROM_MERGE:\n> -\t\ts = \"merge\";\n> +\t\ts = _(\"merge\");\n>  \t\tbreak;\n>  \tcase FROM_CHERRY_PICK:\n> -\t\ts = \"cherry-pick\";\n> +\t\ts = _(\"cherry-pick\");\n>  \t\tbreak;\n>  \t}\n\nbuiltin/commit.c: In function 'whence_s':\nbuiltin/commit.c:206: error: assignment discards qualifiers from pointer target type\nbuiltin/commit.c:209: error: assignment discards qualifiers from pointer target type\n\nI'll squash the following in.  Thanks.\n\n builtin/commit.c |    2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\ndiff --git a/builtin/commit.c b/builtin/commit.c\nindex 663e1fd..470b4a4 100644\n--- a/builtin/commit.c\n+++ b/builtin/commit.c\n@@ -196,7 +196,7 @@ static void determine_whence(struct wt_status *s)\n \n static const char *whence_s(void)\n {\n-\tchar *s = \"\";\n+\tconst char *s = \"\";\n \n \tswitch (whence) {\n \tcase FROM_COMMIT:\n"}]}