{"thread":{"id":"56352","subject":"[PATCH] rebase: emit one \"fatal\" in \"fatal: fatal: <error>\"","startedAt":"2021-08-23T13:07:45Z","lastAt":"2021-08-23T17:29:26Z","messageCount":2,"participants":["Ævar Arnfjörð Bjarmason","Pratik Karki"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"433437","messageId":"patch-1.1-54eb94f6e7a-20210823T130724Z-avarab@gmail.com","threadId":"56352","inReplyTo":null,"subject":"[PATCH] rebase: emit one \"fatal\" in \"fatal: fatal: <error>\"","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2021-08-23T13:07:41Z","receivedAt":"2021-08-23T13:07:45Z","isPatch":true,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"The die() routine adds a \"fatal: \" prefix, there is no reason to add\nanother one. Fixes code added in e65123a71d0 (builtin rebase: support\n`git rebase <upstream> <switch-to>`, 2018-09-04).\n\nSigned-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>\n---\n builtin/rebase.c | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/builtin/rebase.c b/builtin/rebase.c\nindex 33e09619005..66a0a0f0d03 100644\n--- a/builtin/rebase.c\n+++ b/builtin/rebase.c\n@@ -1918,7 +1918,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)\n \t\t\t\t\t\t   &options.orig_head))\n \t\t\toptions.head_name = NULL;\n \t\telse\n-\t\t\tdie(_(\"fatal: no such branch/commit '%s'\"),\n+\t\t\tdie(_(\"no such branch/commit '%s'\"),\n \t\t\t    branch_name);\n \t} else if (argc == 0) {\n \t\t/* Do not need to switch branches, we are already on it. */\n-- \n2.33.0.662.gbc81f8cbdca\n\n"},{"id":"433465","messageId":"CAOZc8M8QFbiLaQDOc9moQeTjuRmKA8e0JscXy3Z9EQXhAuLrMQ@mail.gmail.com","threadId":"56352","inReplyTo":"patch-1.1-54eb94f6e7a-20210823T130724Z-avarab@gmail.com","subject":"Re: [PATCH] rebase: emit one \"fatal\" in \"fatal: fatal: <error>\"","fromName":"Pratik Karki","fromEmail":"predatoramigo@gmail.com","sentAt":"2021-08-23T17:29:10Z","receivedAt":"2021-08-23T17:29:26Z","isPatch":true,"sender":{"key":"predatoramigo@gmail.com","avatar":"https://avatars.githubusercontent.com/u/12194950?v=4"},"body":"On Mon, Aug 23, 2021 at 6:52 PM Ævar Arnfjörð Bjarmason\n<avarab@gmail.com> wrote:\n>\n> The die() routine adds a \"fatal: \" prefix, there is no reason to add\n> another one. Fixes code added in e65123a71d0 (builtin rebase: support\n> `git rebase <upstream> <switch-to>`, 2018-09-04).\n>\n> Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>\n> ---\n>  builtin/rebase.c | 2 +-\n>  1 file changed, 1 insertion(+), 1 deletion(-)\n>\n> diff --git a/builtin/rebase.c b/builtin/rebase.c\n> index 33e09619005..66a0a0f0d03 100644\n> --- a/builtin/rebase.c\n> +++ b/builtin/rebase.c\n> @@ -1918,7 +1918,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)\n>                                                    &options.orig_head))\n>                         options.head_name = NULL;\n>                 else\n> -                       die(_(\"fatal: no such branch/commit '%s'\"),\n> +                       die(_(\"no such branch/commit '%s'\"),\n>                             branch_name);\n>         } else if (argc == 0) {\n>                 /* Do not need to switch branches, we are already on it. */\n\n\nMakes sense. Thank you for fixing this.\n\nBest,\nPratik Karki\n"}]}