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>

diff --git a/builtin/rebase.c b/builtin/rebase.c
index b5c99ec10c200a5fccb293c0acadae80642f2808..85f980bdce277246a6b55f1e1d4be1c14557cf99 100644 (file)
--- 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)
                                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)
                              "(--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);
        }
                              "--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)
                 *       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)
                              "'--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)
                              "'--strategy-option'"));
                if (options.strategy)

-                       die(_("error: cannot combine '--rebase-merges' with "
+                       die(_("cannot combine '--rebase-merges' with "

                              "'--strategy'"));
        }
 
                              "'--strategy'"));
        }
 

diff --git a/git-legacy-rebase.sh b/git-legacy-rebase.sh
index b4c7dbfa575d3b5c664677c22b8613284d2e33fb..11548e927c1bd81f6f93bec0ea0b7452c8a6c397 100755 (executable)
--- a/git-legacy-rebase.sh
+++ b/git-legacy-rebase.sh
@@ -508,13 +508,13 @@ if test -n "$git_am_opt"; then
        then
                if test -n "$incompatible_opts"
                then
        then
                if test -n "$incompatible_opts"
                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
        if test -n "$do_merge"; then
                if test -n "$incompatible_opts"
                then
                fi
        fi
        if test -n "$do_merge"; then
                if test -n "$incompatible_opts"
                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"
 then
        test -n "$preserve_merges" &&
 if test -n "$signoff"
 then
        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"
        force_rebase=t
 fi
        git_am_opt="$git_am_opt $signoff"
        force_rebase=t
 fi


@@ -533,15 +533,15 @@ then
        # Note: incompatibility with --interactive is just a strong warning;
        #       git-rebase.txt caveats with "unless you know what you are doing"
        test -n "$rebase_merges" &&
        # Note: incompatibility with --interactive is just a strong warning;
        #       git-rebase.txt caveats with "unless you know what you are doing"
        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
 
 if test -n "$rebase_merges"
 then
        test -n "$strategy_opts" &&
 fi
 
 if test -n "$rebase_merges"
 then
        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
 
 if test -z "$rebase_root"
 fi
 
 if test -z "$rebase_root"