From: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Date: Mon, 23 Aug 2021 13:07:41 +0000 (+0200)
Subject: rebase: emit one "fatal" in "fatal: fatal: <error>"
X-Git-Tag: v2.33.1~64^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0160f7e7252f2fa40e591d5fa9a30674334050f9;p=thirdparty%2Fgit.git

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

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>
---

diff --git a/builtin/rebase.c b/builtin/rebase.c
index 12f093121d..0d806da68b 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. */