diff options
| author | Elijah Newren <newren@gmail.com> | 2018-12-11 08:11:32 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-12-28 12:49:48 -0800 |
| commit | c913c5964c3a7b5158a76c02721acbd0df6e2b40 (patch) | |
| tree | fa6c46bd6bf56e5b9c8ad0b684acb9e23245d455 /builtin/rebase.c | |
| parent | 0d0ac3826a3bbb9247e39e12623bbcfdd722f24c (diff) | |
| download | git-c913c5964c3a7b5158a76c02721acbd0df6e2b40.tar.gz | |
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>
Diffstat (limited to 'builtin/rebase.c')
| -rw-r--r-- | builtin/rebase.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/builtin/rebase.c b/builtin/rebase.c index b5c99ec10c..85f980bdce 100644 --- a/builtin/rebase.c +++ b/builtin/rebase.c @@ -1223,12 +1223,12 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) break; if (is_interactive(&options) && i >= 0) - die(_("error: cannot combine interactive options " + die(_("cannot combine interactive options " "(--interactive, --exec, --rebase-merges, " "--preserve-merges, --keep-empty, --root + " "--onto) with am options (%s)"), buf.buf); if (options.type == REBASE_MERGE && i >= 0) - die(_("error: cannot combine merge options (--merge, " + die(_("cannot combine merge options (--merge, " "--strategy, --strategy-option) with am options " "(%s)"), buf.buf); } @@ -1248,15 +1248,15 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) * git-rebase.txt caveats with "unless you know what you are doing" */ if (options.rebase_merges) - die(_("error: cannot combine '--preserve-merges' with " + die(_("cannot combine '--preserve-merges' with " "'--rebase-merges'")); if (options.rebase_merges) { if (strategy_options.nr) - die(_("error: cannot combine '--rebase-merges' with " + die(_("cannot combine '--rebase-merges' with " "'--strategy-option'")); if (options.strategy) - die(_("error: cannot combine '--rebase-merges' with " + die(_("cannot combine '--rebase-merges' with " "'--strategy'")); } |