From: "Harmen Stoppels via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Harmen Stoppels <me@harmenstoppels.nl>,
Harmen Stoppels <me@harmenstoppels.nl>
Subject: [PATCH v2] rebase: make warning less passive aggressive
Date: Wed, 21 Feb 2024 17:38:17 +0000 [thread overview]
Message-ID: <pull.1669.v2.git.1708537097448.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.1669.git.1708442603395.gitgitgadget@gmail.com>
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. Make it appear as a statement, and use lowercase to align
with error message style.
Signed-off-by: Harmen Stoppels <me@harmenstoppels.nl>
---
rebase: make warning less passive aggressive
cc: Patrick Steinhardt ps@pks.im
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
next prev parent reply other threads:[~2024-02-21 17:38 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-20 15:23 [PATCH] rebase: make warning less passive aggressive Harmen Stoppels via GitGitGadget
2024-02-20 17:29 ` Junio C Hamano
2024-02-21 17:38 ` Michal Suchánek
2024-02-21 17:56 ` Junio C Hamano
2024-02-21 18:02 ` Junio C Hamano
2024-02-21 18:30 ` Michal Suchánek
2024-02-21 22:05 ` Jean-Noël AVILA
2024-02-21 22:46 ` Junio C Hamano
2024-02-22 1:43 ` Junio C Hamano
2024-02-22 10:01 ` Jean-Noël AVILA
2024-02-22 11:04 ` Michal Suchánek
2024-02-22 16:46 ` Junio C Hamano
2024-02-21 7:14 ` Patrick Steinhardt
2024-02-21 17:31 ` Junio C Hamano
2024-02-21 17:38 ` Harmen Stoppels via GitGitGadget [this message]
2024-02-22 8:15 ` [PATCH v2] " Patrick Steinhardt
2024-02-22 10:53 ` Kristoffer Haugsbakk
2024-02-22 17:00 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=pull.1669.v2.git.1708537097448.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=git@vger.kernel.org \
--cc=me@harmenstoppels.nl \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).