]> git.ipfire.org Git - thirdparty/git.git/commitdiff
rebase: emit one "fatal" in "fatal: fatal: <error>"
authorÆvar Arnfjörð Bjarmason <avarab@gmail.com>
Mon, 23 Aug 2021 13:07:41 +0000 (15:07 +0200)
committerJunio C Hamano <gitster@pobox.com>
Tue, 24 Aug 2021 21:48:16 +0000 (14:48 -0700)
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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/rebase.c

index 12f093121d9ed3df0d345992da14de908c119271..0d806da68ba1b0bb4ff23ec8d39245dc758ef00e 100644 (file)
@@ -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. */