* [PATCH] rebase: emit one "fatal" in "fatal: fatal: <error>"
@ 2021-08-23 13:07 Ævar Arnfjörð Bjarmason
2021-08-23 17:29 ` Pratik Karki
0 siblings, 1 reply; 2+ messages in thread
From: Ævar Arnfjörð Bjarmason @ 2021-08-23 13:07 UTC (permalink / raw)
To: git; +Cc: Junio C Hamano, Pratik Karki,
Ævar Arnfjörð Bjarmason
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. */
--
2.33.0.662.gbc81f8cbdca
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH] rebase: emit one "fatal" in "fatal: fatal: <error>"
2021-08-23 13:07 [PATCH] rebase: emit one "fatal" in "fatal: fatal: <error>" Ævar Arnfjörð Bjarmason
@ 2021-08-23 17:29 ` Pratik Karki
0 siblings, 0 replies; 2+ messages in thread
From: Pratik Karki @ 2021-08-23 17:29 UTC (permalink / raw)
To: Ævar Arnfjörð Bjarmason; +Cc: git, Junio C Hamano
On Mon, Aug 23, 2021 at 6:52 PM Ævar Arnfjörð Bjarmason
<avarab@gmail.com> wrote:
>
> 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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-08-23 17:29 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-08-23 13:07 [PATCH] rebase: emit one "fatal" in "fatal: fatal: <error>" Ævar Arnfjörð Bjarmason
2021-08-23 17:29 ` Pratik Karki
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).