Skip to content

Commit

Permalink
rebase: make warning less passive aggressive
Browse files Browse the repository at this point in the history
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@harmenstoppels.nl>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
haampie authored and gitster committed Feb 21, 2024
1 parent 0d1bd1d commit 244001a
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion builtin/rebase.c
Expand Up @@ -1235,7 +1235,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 "
Expand Down

0 comments on commit 244001a

Please sign in to comment.