git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH] rebase: make warning less passive aggressive

From
Patrick Steinhardt <ps@pks.im>
Date
Feb 21, 2024, 07:14 UTC
Message-ID
<ZdWiyYhKAB3_P6_k@tanuki>
In-Reply-To
<pull.1669.git.1708442603395.gitgitgadget@gmail.com>
On Tue, Feb 20, 2024 at 03:23:21PM +0000, Harmen Stoppels via GitGitGadget wrote:
Show 45 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.
> 
> Signed-off-by: Harmen Stoppels <me@harmenstoppels.nl>
> ---
>     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
Previous: Junio C HamanoNext: Junio C Hamano
Message 13 of 18 in “rebase: make warning less passive aggressive”
  1. rebase: make warning less passive aggressiveHarmen Stoppels via GitGitGadget, Feb 20, 2024
  2. Junio C HamanoFeb 20, 2024
  3. Michal SuchánekFeb 21, 2024
  4. Junio C HamanoFeb 21, 2024
  5. Junio C HamanoFeb 21, 2024
  6. Michal SuchánekFeb 21, 2024
  7. Jean-Noël AVILAFeb 21, 2024
  8. Junio C HamanoFeb 21, 2024
  9. Junio C HamanoFeb 22, 2024
  10. Jean-Noël AVILAFeb 22, 2024
  11. Michal SuchánekFeb 22, 2024
  12. Junio C HamanoFeb 22, 2024
  13. Patrick SteinhardtFeb 21, 2024
  14. Junio C HamanoFeb 21, 2024
  15. rebase: make warning less passive aggressiveHarmen Stoppels via GitGitGadget, Feb 21, 2024
  16. Patrick SteinhardtFeb 22, 2024
  17. Kristoffer HaugsbakkFeb 22, 2024
  18. Junio C HamanoFeb 22, 2024

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.