On Wed, Feb 21, 2024 at 05:38:17PM +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. Make it appear as a statement, and use lowercase to align > with error message style. > > Signed-off-by: Harmen Stoppels <me@xxxxxxxxxxxxxxxxx> Got nothing else to add, this looks good to me. Thanks! Patrick > --- > rebase: make warning less passive aggressive > > cc: Patrick Steinhardt ps@xxxxxx > > Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-1669%2Fhaampie%2Ffix%2Fpassive-agressive-message-v2 > Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1669/haampie/fix/passive-agressive-message-v2 > Pull-Request: https://github.com/gitgitgadget/git/pull/1669 > > Range-diff vs v1: > > 1: 4dfc578da84 < -: ----------- rebase: make warning less passive aggressive > -: ----------- > 1: a6f7a3a2477 rebase: make warning less passive aggressive > > > builtin/rebase.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/builtin/rebase.c b/builtin/rebase.c > index 5b086f651a6..6ead9465a42 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 " > > base-commit: 96c8a0712e569dd2812bf4fb5e72113caf326500 > -- > gitgitgadget >
Attachment:
signature.asc
Description: PGP signature
