# [PATCH] i18n: unmark a message in rebase.c 3 messages from 2020-03-11 to 2020-03-11. Participants: Jiang Xin, Junio C Hamano, Elijah Newren. Thread: https://gitlist.dev/t/52975 ## Jiang Xin, 2020-03-11 06:55 Subject: [PATCH] i18n: unmark a message in rebase.c Message-ID: <20200311065527.7669-1-worldhello.net@gmail.com> URL: https://gitlist.dev/e/20200311065527.7669-1-worldhello.net%40gmail.com ``` Commit v2.25.0-4-ge98c4269c8 (rebase (interactive-backend): fix handling of commits that become empty, 2020-02-15) marked "{drop,keep,ask}" for translation, but this message should not be changed. Signed-off-by: Jiang Xin --- builtin/rebase.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/rebase.c b/builtin/rebase.c index cb7aeae597..bff53d5d16 100644 --- a/builtin/rebase.c +++ b/builtin/rebase.c @@ -1543,7 +1543,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) "ignoring them"), REBASE_PRESERVE_MERGES, PARSE_OPT_HIDDEN), OPT_RERERE_AUTOUPDATE(&options.allow_rerere_autoupdate), - OPT_CALLBACK_F(0, "empty", &options, N_("{drop,keep,ask}"), + OPT_CALLBACK_F(0, "empty", &options, "{drop,keep,ask}", N_("how to handle commits that become empty"), PARSE_OPT_NONEG, parse_opt_empty), { OPTION_CALLBACK, 'k', "keep-empty", &options, NULL, -- 2.26.0.rc0.1.g67b07ef6f6 ``` ## Elijah Newren, 2020-03-11 16:27 Subject: Re: [PATCH] i18n: unmark a message in rebase.c Message-ID: URL: https://gitlist.dev/e/CABPp-BE2vd2UOKbOaEuW4%3DYLvofFkg%3DmWGmE%3DWFW2gXaR-E5Hw%40mail.gmail.com In-Reply-To: <20200311065527.7669-1-worldhello.net@gmail.com> ``` On Tue, Mar 10, 2020 at 11:55 PM Jiang Xin wrote: > > Commit v2.25.0-4-ge98c4269c8 (rebase (interactive-backend): fix handling > of commits that become empty, 2020-02-15) marked "{drop,keep,ask}" for > translation, but this message should not be changed. > > Signed-off-by: Jiang Xin > --- > builtin/rebase.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/builtin/rebase.c b/builtin/rebase.c > index cb7aeae597..bff53d5d16 100644 > --- a/builtin/rebase.c > +++ b/builtin/rebase.c > @@ -1543,7 +1543,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) > "ignoring them"), > REBASE_PRESERVE_MERGES, PARSE_OPT_HIDDEN), > OPT_RERERE_AUTOUPDATE(&options.allow_rerere_autoupdate), > - OPT_CALLBACK_F(0, "empty", &options, N_("{drop,keep,ask}"), > + OPT_CALLBACK_F(0, "empty", &options, "{drop,keep,ask}", > N_("how to handle commits that become empty"), > PARSE_OPT_NONEG, parse_opt_empty), > { OPTION_CALLBACK, 'k', "keep-empty", &options, NULL, > -- > 2.26.0.rc0.1.g67b07ef6f6 Thanks for the fix. ``` ## Junio C Hamano, 2020-03-11 18:39 Subject: Re: [PATCH] i18n: unmark a message in rebase.c Message-ID: URL: https://gitlist.dev/e/xmqqsgiehh2r.fsf%40gitster.c.googlers.com In-Reply-To: <20200311065527.7669-1-worldhello.net@gmail.com> ``` Jiang Xin writes: > Commit v2.25.0-4-ge98c4269c8 (rebase (interactive-backend): fix handling > of commits that become empty, 2020-02-15) marked "{drop,keep,ask}" for > translation, but this message should not be changed. Thanks. > > Signed-off-by: Jiang Xin > --- > builtin/rebase.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/builtin/rebase.c b/builtin/rebase.c > index cb7aeae597..bff53d5d16 100644 > --- a/builtin/rebase.c > +++ b/builtin/rebase.c > @@ -1543,7 +1543,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) > "ignoring them"), > REBASE_PRESERVE_MERGES, PARSE_OPT_HIDDEN), > OPT_RERERE_AUTOUPDATE(&options.allow_rerere_autoupdate), > - OPT_CALLBACK_F(0, "empty", &options, N_("{drop,keep,ask}"), > + OPT_CALLBACK_F(0, "empty", &options, "{drop,keep,ask}", > N_("how to handle commits that become empty"), > PARSE_OPT_NONEG, parse_opt_empty), > { OPTION_CALLBACK, 'k', "keep-empty", &options, NULL, ```