| Message ID | 20180928192849.30792-1-ralf.thielow@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | git-rebase.sh: fix typos in error messages | expand |
Ralf Thielow <ralf.thielow@gmail.com> writes: > Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> > --- > git-rebase.sh | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) This patch itself will soon stop mattering once the group of rebase-in-c topics graduate, which hopefully will happen during this cycle. However, because the same mistakes are inherited to builtin/rebase.c by these topics, we'd need a matching fix to correct 07664161 ("builtin rebase: error out on incompatible option/mode combinations", 2018-08-08) and either squash the fix into that commit, or queue it on top of pk/rebase-in-c-5-test topic. Will queue; thanks. > > diff --git a/git-rebase.sh b/git-rebase.sh > index 7973447645..45b6ee9c0e 100755 > --- a/git-rebase.sh > +++ b/git-rebase.sh > @@ -553,15 +553,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" && > - die "$(gettext "error: cannot combine '--preserve_merges' with '--rebase-merges'")" > + die "$(gettext "error: cannot combine '--preserve-merges' with '--rebase-merges'")" > fi > > if test -n "$rebase_merges" > then > test -n "$strategy_opts" && > - die "$(gettext "error: cannot combine '--rebase_merges' with '--strategy-option'")" > + die "$(gettext "error: cannot combine '--rebase-merges' with '--strategy-option'")" > test -n "$strategy" && > - die "$(gettext "error: cannot combine '--rebase_merges' with '--strategy'")" > + die "$(gettext "error: cannot combine '--rebase-merges' with '--strategy'")" > fi > > if test -z "$rebase_root"
Junio C Hamano <gitster@pobox.com> writes: > ... However, because the same mistakes are inherited to > builtin/rebase.c by these topics, we'd need a matching fix to > correct 07664161 ("builtin rebase: error out on incompatible > option/mode combinations", 2018-08-08) and either squash the fix > into that commit, or queue it on top of pk/rebase-in-c-5-test topic. > > Will queue; thanks. Here is what I'd queue, too. -- >8 -- Subject: [PATCH] rebase: fix typos in error messages The separator between words in a multi-word option name is a dash, not an underscore. Inspired by a matching change by Ralf Thielow for the scripted version of "git rebase". Signed-off-by: Junio C Hamano <gitster@pobox.com> --- builtin/rebase.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/builtin/rebase.c b/builtin/rebase.c index 1a697d70c9..0f9a40aae5 100644 --- a/builtin/rebase.c +++ b/builtin/rebase.c @@ -1135,15 +1135,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(_("error: cannot combine '--preserve-merges' with " "'--rebase-merges'")); if (options.rebase_merges) { if (strategy_options.nr) - die(_("error: cannot combine '--rebase_merges' with " + die(_("error: cannot combine '--rebase-merges' with " "'--strategy-option'")); if (options.strategy) - die(_("error: cannot combine '--rebase_merges' with " + die(_("error: cannot combine '--rebase-merges' with " "'--strategy'")); }
diff --git a/git-rebase.sh b/git-rebase.sh index 7973447645..45b6ee9c0e 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -553,15 +553,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" && - die "$(gettext "error: cannot combine '--preserve_merges' with '--rebase-merges'")" + die "$(gettext "error: cannot combine '--preserve-merges' with '--rebase-merges'")" fi if test -n "$rebase_merges" then test -n "$strategy_opts" && - die "$(gettext "error: cannot combine '--rebase_merges' with '--strategy-option'")" + die "$(gettext "error: cannot combine '--rebase-merges' with '--strategy-option'")" test -n "$strategy" && - die "$(gettext "error: cannot combine '--rebase_merges' with '--strategy'")" + die "$(gettext "error: cannot combine '--rebase-merges' with '--strategy'")" fi if test -z "$rebase_root"
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> --- git-rebase.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)