]> git.ipfire.org Git - thirdparty/git.git/commit - builtin/rebase.c
rebase: make builtin and legacy script error messages the same
authorElijah Newren <newren@gmail.com>
Tue, 11 Dec 2018 16:11:32 +0000 (08:11 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 28 Dec 2018 20:49:48 +0000 (12:49 -0800)
commitc913c5964c3a7b5158a76c02721acbd0df6e2b40
treefa6c46bd6bf56e5b9c8ad0b684acb9e23245d455
parent0d0ac3826a3bbb9247e39e12623bbcfdd722f24c
rebase: make builtin and legacy script error messages the same

The conversion of the script version of rebase took messages that were
prefixed with "error:" and passed them along to die(), which adds a
"fatal:" prefix, thus resulting in messages of the form:

  fatal: error: cannot combine...

which seems redundant.  Remove the "error:" prefix from the builtin
version of rebase, and change the prefix from "error:" to "fatal:" in
the legacy script to match.

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/rebase.c
git-legacy-rebase.sh