threads / patch / 56352

patchrebase: emit one "fatal" in "fatal: fatal: <error>"

Subject: [PATCH] rebase: emit one "fatal" in "fatal: fatal: <error>"

## tl;dr

2 messages between Aug 23, 2021 and Aug 23, 2021. Diffs are folded; open one to read it.

replies: 1people: 2as markdown or json

Ævar Arnfjörð Bjarmason· Aug 23, 2021, 13:07 UTC · lore

The die() routine adds a "fatal: " prefix, there is no reason to add another one. Fixes code added in e65123a71d0 (builtin rebase: support `git rebase <upstream> <switch-to>`, 2018-09-04).

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
---
 builtin/rebase.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Show changes to builtin/rebase.c +1 −1
diff --git a/builtin/rebase.c b/builtin/rebase.c
index 33e09619005..66a0a0f0d03 100644
--- a/builtin/rebase.c
+++ b/builtin/rebase.c
@@ -1918,7 +1918,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
 						   &options.orig_head))
 			options.head_name = NULL;
 		else
-			die(_("fatal: no such branch/commit '%s'"),
+			die(_("no such branch/commit '%s'"),
 			    branch_name);
 	} else if (argc == 0) {
 		/* Do not need to switch branches, we are already on it. */
-- 
2.33.0.662.gbc81f8cbdca
Pratik Karki· Aug 23, 2021, 17:29 UTC · re: Ævar Arnfjörð Bjarmason · lore

Re: [PATCH] rebase: emit one "fatal" in "fatal: fatal: <error>"

On Mon, Aug 23, 2021 at 6:52 PM Ævar Arnfjörð Bjarmason <avarab@gmail.com> wrote:

Show 23 quoted lines
>
> The die() routine adds a "fatal: " prefix, there is no reason to add
> another one. Fixes code added in e65123a71d0 (builtin rebase: support
> `git rebase <upstream> <switch-to>`, 2018-09-04).
>
> Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
> ---
>  builtin/rebase.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/builtin/rebase.c b/builtin/rebase.c
> index 33e09619005..66a0a0f0d03 100644
> --- a/builtin/rebase.c
> +++ b/builtin/rebase.c
> @@ -1918,7 +1918,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
>                                                    &options.orig_head))
>                         options.head_name = NULL;
>                 else
> -                       die(_("fatal: no such branch/commit '%s'"),
> +                       die(_("no such branch/commit '%s'"),
>                             branch_name);
>         } else if (argc == 0) {
>                 /* Do not need to switch branches, we are already on it. */
Makes sense. Thank you for fixing this.

Best, Pratik Karki

← back to recent threads