On Tue, Feb 20, 2024 at 03:23:21PM +0000, Harmen Stoppels via GitGitGadget wrote: > From: Harmen Stoppels <me@xxxxxxxxxxxxxxxxx> > > 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. > > Signed-off-by: Harmen Stoppels <me@xxxxxxxxxxxxxxxxx> > --- > rebase: make warning less passive aggressive > > Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-1669%2Fhaampie%2Ffix%2Fpassive-agressive-message-v1 > Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1669/haampie/fix/passive-agressive-message-v1 > Pull-Request: https://github.com/gitgitgadget/git/pull/1669 > > builtin/rebase.c | 2 +- > 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")); While we're at it changing this message, do we also want to convert it to start with a lower-case letter so that it aligns with our error message style? Patrick
Attachment:
signature.asc
Description: PGP signature
