Re: [PATCH] rebase: make warning less passive aggressive
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Feb 20, 2024, 17:29 UTC
- Message-ID
- <xmqqv86jqc2e.fsf@gitster.g>
- In-Reply-To
- <pull.1669.git.1708442603395.gitgitgadget@gmail.com>
"Harmen Stoppels via GitGitGadget" <gitgitgadget@gmail.com> writes:
Show 5 quoted lines
> From: Harmen Stoppels <me@harmenstoppels.nl> > > When you run `git rebase --continue` when no rebase is in progress, git > outputs `fatal: no rebase in progress?` which is not a question but a > statement. This commit makes it appear as a statement.
"This commit makes it appear" -> "Make it appear" (see SubmittingPatches).
> builtin/rebase.c | 2 +-
This change is very good, but a commit that touches code should not touch po/ localizations in this project. They are updated to match the code change by respective language teams.
Show 33 quoted lines
> po/bg.po | 2 +-
> po/ca.po | 2 +-
> po/de.po | 2 +-
> po/el.po | 2 +-
> po/es.po | 2 +-
> po/fr.po | 2 +-
> po/id.po | 2 +-
> po/it.po | 2 +-
> po/ko.po | 2 +-
> po/pl.po | 2 +-
> po/pt_PT.po | 2 +-
> po/ru.po | 2 +-
> po/sv.po | 2 +-
> po/tr.po | 2 +-
> po/uk.po | 2 +-
> po/vi.po | 2 +-
> po/zh_CN.po | 2 +-
> po/zh_TW.po | 2 +-
> 19 files changed, 19 insertions(+), 19 deletions(-)
>
> diff --git a/builtin/rebase.c b/builtin/rebase.c
> index 5b086f651a6..415783c4a21 100644
> --- a/builtin/rebase.c
> +++ b/builtin/rebase.c
> @@ -1254,7 +1254,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
> die(_("options '%s' and '%s' cannot be used together"), "--root", "--fork-point");
>
> if (options.action != ACTION_NONE && !in_progress)
> - die(_("No rebase in progress?"));
> + die(_("No rebase in progress"));
>
> if (options.action == ACTION_EDIT_TODO && !is_merge(&options))
> die(_("The --edit-todo action can only be used during "Interestingly this change does not break any test in t/ directory, which means we have a gap in test coverage. It should not be any part of this patch, but we may want to add a test to exercise this codepath (#leftoverbits).
Thanks.