{"thread":{"id":"52975","subject":"[PATCH] i18n: unmark a message in rebase.c","startedAt":"2020-03-11T06:55:53Z","lastAt":"2020-03-11T18:39:15Z","messageCount":3,"participants":["Jiang Xin","Junio C Hamano","Elijah Newren"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"393054","messageId":"20200311065527.7669-1-worldhello.net@gmail.com","threadId":"52975","inReplyTo":null,"subject":"[PATCH] i18n: unmark a message in rebase.c","fromName":"Jiang Xin","fromEmail":"worldhello.net@gmail.com","sentAt":"2020-03-11T06:55:27Z","receivedAt":"2020-03-11T06:55:53Z","isPatch":true,"sender":{"key":"worldhello.net@gmail.com","avatar":"https://avatars.githubusercontent.com/u/183860?v=4"},"body":"Commit v2.25.0-4-ge98c4269c8 (rebase (interactive-backend): fix handling\nof commits that become empty, 2020-02-15) marked \"{drop,keep,ask}\" for\ntranslation, but this message should not be changed.\n\nSigned-off-by: Jiang Xin <worldhello.net@gmail.com>\n---\n builtin/rebase.c | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/builtin/rebase.c b/builtin/rebase.c\nindex cb7aeae597..bff53d5d16 100644\n--- a/builtin/rebase.c\n+++ b/builtin/rebase.c\n@@ -1543,7 +1543,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)\n \t\t\t\t \"ignoring them\"),\n \t\t\t      REBASE_PRESERVE_MERGES, PARSE_OPT_HIDDEN),\n \t\tOPT_RERERE_AUTOUPDATE(&options.allow_rerere_autoupdate),\n-\t\tOPT_CALLBACK_F(0, \"empty\", &options, N_(\"{drop,keep,ask}\"),\n+\t\tOPT_CALLBACK_F(0, \"empty\", &options, \"{drop,keep,ask}\",\n \t\t\t       N_(\"how to handle commits that become empty\"),\n \t\t\t       PARSE_OPT_NONEG, parse_opt_empty),\n \t\t{ OPTION_CALLBACK, 'k', \"keep-empty\", &options, NULL,\n-- \n2.26.0.rc0.1.g67b07ef6f6\n\n"},{"id":"393075","messageId":"CABPp-BE2vd2UOKbOaEuW4=YLvofFkg=mWGmE=WFW2gXaR-E5Hw@mail.gmail.com","threadId":"52975","inReplyTo":"20200311065527.7669-1-worldhello.net@gmail.com","subject":"Re: [PATCH] i18n: unmark a message in rebase.c","fromName":"Elijah Newren","fromEmail":"newren@gmail.com","sentAt":"2020-03-11T16:27:17Z","receivedAt":"2020-03-11T16:27:47Z","isPatch":true,"sender":{"key":"newren@gmail.com","avatar":"https://avatars.githubusercontent.com/u/5455730?v=4"},"body":"On Tue, Mar 10, 2020 at 11:55 PM Jiang Xin <worldhello.net@gmail.com> wrote:\n>\n> Commit v2.25.0-4-ge98c4269c8 (rebase (interactive-backend): fix handling\n> of commits that become empty, 2020-02-15) marked \"{drop,keep,ask}\" for\n> translation, but this message should not be changed.\n>\n> Signed-off-by: Jiang Xin <worldhello.net@gmail.com>\n> ---\n>  builtin/rebase.c | 2 +-\n>  1 file changed, 1 insertion(+), 1 deletion(-)\n>\n> diff --git a/builtin/rebase.c b/builtin/rebase.c\n> index cb7aeae597..bff53d5d16 100644\n> --- a/builtin/rebase.c\n> +++ b/builtin/rebase.c\n> @@ -1543,7 +1543,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)\n>                                  \"ignoring them\"),\n>                               REBASE_PRESERVE_MERGES, PARSE_OPT_HIDDEN),\n>                 OPT_RERERE_AUTOUPDATE(&options.allow_rerere_autoupdate),\n> -               OPT_CALLBACK_F(0, \"empty\", &options, N_(\"{drop,keep,ask}\"),\n> +               OPT_CALLBACK_F(0, \"empty\", &options, \"{drop,keep,ask}\",\n>                                N_(\"how to handle commits that become empty\"),\n>                                PARSE_OPT_NONEG, parse_opt_empty),\n>                 { OPTION_CALLBACK, 'k', \"keep-empty\", &options, NULL,\n> --\n> 2.26.0.rc0.1.g67b07ef6f6\n\nThanks for the fix.\n"},{"id":"393066","messageId":"xmqqsgiehh2r.fsf@gitster.c.googlers.com","threadId":"52975","inReplyTo":"20200311065527.7669-1-worldhello.net@gmail.com","subject":"Re: [PATCH] i18n: unmark a message in rebase.c","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2020-03-11T18:39:08Z","receivedAt":"2020-03-11T18:39:15Z","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> Commit v2.25.0-4-ge98c4269c8 (rebase (interactive-backend): fix handling\n> of commits that become empty, 2020-02-15) marked \"{drop,keep,ask}\" for\n> translation, but this message should not be changed.\n\nThanks.\n\n>\n> Signed-off-by: Jiang Xin <worldhello.net@gmail.com>\n> ---\n>  builtin/rebase.c | 2 +-\n>  1 file changed, 1 insertion(+), 1 deletion(-)\n>\n> diff --git a/builtin/rebase.c b/builtin/rebase.c\n> index cb7aeae597..bff53d5d16 100644\n> --- a/builtin/rebase.c\n> +++ b/builtin/rebase.c\n> @@ -1543,7 +1543,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)\n>  \t\t\t\t \"ignoring them\"),\n>  \t\t\t      REBASE_PRESERVE_MERGES, PARSE_OPT_HIDDEN),\n>  \t\tOPT_RERERE_AUTOUPDATE(&options.allow_rerere_autoupdate),\n> -\t\tOPT_CALLBACK_F(0, \"empty\", &options, N_(\"{drop,keep,ask}\"),\n> +\t\tOPT_CALLBACK_F(0, \"empty\", &options, \"{drop,keep,ask}\",\n>  \t\t\t       N_(\"how to handle commits that become empty\"),\n>  \t\t\t       PARSE_OPT_NONEG, parse_opt_empty),\n>  \t\t{ OPTION_CALLBACK, 'k', \"keep-empty\", &options, NULL,\n"}]}