undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rebase: make builtin and legacy script error messages the same

Browse Source 
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>
This commit is contained in:
Elijah Newren 2018-12-11 08:11:32 -08:00 committed by Junio C Hamano
parent 0d0ac3826a
commit c913c5964c
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
builtin/rebase.c
View File

@ -1223,12 +1223,12 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
break; break;
if (is_interactive(&options) && i >= 0) if (is_interactive(&options) && i >= 0)
die(_("error: cannot combine interactive options " die(_("cannot combine interactive options "
"(--interactive, --exec, --rebase-merges, " "(--interactive, --exec, --rebase-merges, "
"--preserve-merges, --keep-empty, --root + " "--preserve-merges, --keep-empty, --root + "
"--onto) with am options (%s)"), buf.buf); "--onto) with am options (%s)"), buf.buf);
if (options.type == REBASE_MERGE && i >= 0) 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 " "--strategy, --strategy-option) with am options "
"(%s)"), buf.buf); "(%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" * git-rebase.txt caveats with "unless you know what you are doing"
*/ */
if (options.rebase_merges) if (options.rebase_merges)
die(_("error: cannot combine '--preserve-merges' with " die(_("cannot combine '--preserve-merges' with "
"'--rebase-merges'")); "'--rebase-merges'"));
if (options.rebase_merges) { if (options.rebase_merges) {
if (strategy_options.nr) if (strategy_options.nr)
die(_("error: cannot combine '--rebase-merges' with " die(_("cannot combine '--rebase-merges' with "
"'--strategy-option'")); "'--strategy-option'"));
if (options.strategy) if (options.strategy)
die(_("error: cannot combine '--rebase-merges' with " die(_("cannot combine '--rebase-merges' with "
"'--strategy'")); "'--strategy'"));
} }

12
git-legacy-rebase.sh
View File

@ -508,13 +508,13 @@ if test -n "$git_am_opt"; then
then then
if test -n "$incompatible_opts" if test -n "$incompatible_opts"
then then
die "$(gettext "error: cannot combine interactive options (--interactive, --exec, --rebase-merges, --preserve-merges, --keep-empty, --root + --onto) with am options ($incompatible_opts)")" die "$(gettext "fatal: cannot combine interactive options (--interactive, --exec, --rebase-merges, --preserve-merges, --keep-empty, --root + --onto) with am options ($incompatible_opts)")"
fi fi
fi fi
if test -n "$do_merge"; then if test -n "$do_merge"; then
if test -n "$incompatible_opts" if test -n "$incompatible_opts"
then then
die "$(gettext "error: cannot combine merge options (--merge, --strategy, --strategy-option) with am options ($incompatible_opts)")" die "$(gettext "fatal: cannot combine merge options (--merge, --strategy, --strategy-option) with am options ($incompatible_opts)")"
fi fi
fi fi
fi fi
@ -522,7 +522,7 @@ fi
if test -n "$signoff" if test -n "$signoff"
then then
test -n "$preserve_merges" && test -n "$preserve_merges" &&
die "$(gettext "error: cannot combine '--signoff' with '--preserve-merges'")" die "$(gettext "fatal: cannot combine '--signoff' with '--preserve-merges'")"
git_am_opt="$git_am_opt $signoff" git_am_opt="$git_am_opt $signoff"
force_rebase=t force_rebase=t
fi fi
@ -533,15 +533,15 @@ then
# Note: incompatibility with --interactive is just a strong warning; # Note: incompatibility with --interactive is just a strong warning;
# git-rebase.txt caveats with "unless you know what you are doing" # git-rebase.txt caveats with "unless you know what you are doing"
test -n "$rebase_merges" && test -n "$rebase_merges" &&
die "$(gettext "error: cannot combine '--preserve-merges' with '--rebase-merges'")" die "$(gettext "fatal: cannot combine '--preserve-merges' with '--rebase-merges'")"
fi fi
if test -n "$rebase_merges" if test -n "$rebase_merges"
then then
test -n "$strategy_opts" && test -n "$strategy_opts" &&
die "$(gettext "error: cannot combine '--rebase-merges' with '--strategy-option'")" die "$(gettext "fatal: cannot combine '--rebase-merges' with '--strategy-option'")"
test -n "$strategy" && test -n "$strategy" &&
die "$(gettext "error: cannot combine '--rebase-merges' with '--strategy'")" die "$(gettext "fatal: cannot combine '--rebase-merges' with '--strategy'")"
fi fi
if test -z "$rebase_root" if test -z "$rebase_root"