{"thread":{"id":"49453","subject":"[PATCH] git-rebase.sh: fix typos in error messages","startedAt":"2018-09-28T19:28:56Z","lastAt":"2018-09-28T22:05:25Z","messageCount":3,"participants":["Ralf Thielow","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"359239","messageId":"20180928192849.30792-1-ralf.thielow@gmail.com","threadId":"49453","inReplyTo":null,"subject":"[PATCH] git-rebase.sh: fix typos in error messages","fromName":"Ralf Thielow","fromEmail":"ralf.thielow@gmail.com","sentAt":"2018-09-28T19:28:49Z","receivedAt":"2018-09-28T19:28:56Z","isPatch":true,"sender":{"key":"ralf.thielow@gmail.com","avatar":"https://avatars.githubusercontent.com/u/1275832?v=4"},"body":"Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>\n---\n git-rebase.sh | 6 +++---\n 1 file changed, 3 insertions(+), 3 deletions(-)\n\ndiff --git a/git-rebase.sh b/git-rebase.sh\nindex 7973447645..45b6ee9c0e 100755\n--- a/git-rebase.sh\n+++ b/git-rebase.sh\n@@ -553,15 +553,15 @@ then\n \t# Note: incompatibility with --interactive is just a strong warning;\n \t#       git-rebase.txt caveats with \"unless you know what you are doing\"\n \ttest -n \"$rebase_merges\" &&\n-\t\tdie \"$(gettext \"error: cannot combine '--preserve_merges' with '--rebase-merges'\")\"\n+\t\tdie \"$(gettext \"error: cannot combine '--preserve-merges' with '--rebase-merges'\")\"\n fi\n \n if test -n \"$rebase_merges\"\n then\n \ttest -n \"$strategy_opts\" &&\n-\t\tdie \"$(gettext \"error: cannot combine '--rebase_merges' with '--strategy-option'\")\"\n+\t\tdie \"$(gettext \"error: cannot combine '--rebase-merges' with '--strategy-option'\")\"\n \ttest -n \"$strategy\" &&\n-\t\tdie \"$(gettext \"error: cannot combine '--rebase_merges' with '--strategy'\")\"\n+\t\tdie \"$(gettext \"error: cannot combine '--rebase-merges' with '--strategy'\")\"\n fi\n \n if test -z \"$rebase_root\"\n-- \n2.19.0.599.g22e244bd67\n\n"},{"id":"359255","messageId":"xmqqzhw19t9a.fsf@gitster-ct.c.googlers.com","threadId":"49453","inReplyTo":"20180928192849.30792-1-ralf.thielow@gmail.com","subject":"Re: [PATCH] git-rebase.sh: fix typos in error messages","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2018-09-28T22:01:05Z","receivedAt":"2018-09-28T22:01:10Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Ralf Thielow <ralf.thielow@gmail.com> writes:\n\n> Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>\n> ---\n>  git-rebase.sh | 6 +++---\n>  1 file changed, 3 insertions(+), 3 deletions(-)\n\nThis patch itself will soon stop mattering once the group of\nrebase-in-c topics graduate, which hopefully will happen during this\ncycle.  However, because the same mistakes are inherited to\nbuiltin/rebase.c by these topics, we'd need a matching fix to\ncorrect 07664161 (\"builtin rebase: error out on incompatible\noption/mode combinations\", 2018-08-08) and either squash the fix\ninto that commit, or queue it on top of pk/rebase-in-c-5-test topic.\n\nWill queue; thanks.\n\n>\n> diff --git a/git-rebase.sh b/git-rebase.sh\n> index 7973447645..45b6ee9c0e 100755\n> --- a/git-rebase.sh\n> +++ b/git-rebase.sh\n> @@ -553,15 +553,15 @@ then\n>  \t# Note: incompatibility with --interactive is just a strong warning;\n>  \t#       git-rebase.txt caveats with \"unless you know what you are doing\"\n>  \ttest -n \"$rebase_merges\" &&\n> -\t\tdie \"$(gettext \"error: cannot combine '--preserve_merges' with '--rebase-merges'\")\"\n> +\t\tdie \"$(gettext \"error: cannot combine '--preserve-merges' with '--rebase-merges'\")\"\n>  fi\n>  \n>  if test -n \"$rebase_merges\"\n>  then\n>  \ttest -n \"$strategy_opts\" &&\n> -\t\tdie \"$(gettext \"error: cannot combine '--rebase_merges' with '--strategy-option'\")\"\n> +\t\tdie \"$(gettext \"error: cannot combine '--rebase-merges' with '--strategy-option'\")\"\n>  \ttest -n \"$strategy\" &&\n> -\t\tdie \"$(gettext \"error: cannot combine '--rebase_merges' with '--strategy'\")\"\n> +\t\tdie \"$(gettext \"error: cannot combine '--rebase-merges' with '--strategy'\")\"\n>  fi\n>  \n>  if test -z \"$rebase_root\"\n"},{"id":"359257","messageId":"xmqqsh1t9t27.fsf@gitster-ct.c.googlers.com","threadId":"49453","inReplyTo":"xmqqzhw19t9a.fsf@gitster-ct.c.googlers.com","subject":"Re: [PATCH] git-rebase.sh: fix typos in error messages","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2018-09-28T22:05:20Z","receivedAt":"2018-09-28T22:05:25Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Junio C Hamano <gitster@pobox.com> writes:\n\n> ...  However, because the same mistakes are inherited to\n> builtin/rebase.c by these topics, we'd need a matching fix to\n> correct 07664161 (\"builtin rebase: error out on incompatible\n> option/mode combinations\", 2018-08-08) and either squash the fix\n> into that commit, or queue it on top of pk/rebase-in-c-5-test topic.\n>\n> Will queue; thanks.\n\nHere is what I'd queue, too.\n\n-- >8 --\nSubject: [PATCH] rebase: fix typos in error messages\n\nThe separator between words in a multi-word option name is a dash,\nnot an underscore.\n\nInspired by a matching change by Ralf Thielow for the scripted\nversion of \"git rebase\".\n\nSigned-off-by: Junio C Hamano <gitster@pobox.com>\n---\n builtin/rebase.c | 6 +++---\n 1 file changed, 3 insertions(+), 3 deletions(-)\n\ndiff --git a/builtin/rebase.c b/builtin/rebase.c\nindex 1a697d70c9..0f9a40aae5 100644\n--- a/builtin/rebase.c\n+++ b/builtin/rebase.c\n@@ -1135,15 +1135,15 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)\n \t\t *       git-rebase.txt caveats with \"unless you know what you are doing\"\n \t\t */\n \t\tif (options.rebase_merges)\n-\t\t\tdie(_(\"error: cannot combine '--preserve_merges' with \"\n+\t\t\tdie(_(\"error: cannot combine '--preserve-merges' with \"\n \t\t\t      \"'--rebase-merges'\"));\n \n \tif (options.rebase_merges) {\n \t\tif (strategy_options.nr)\n-\t\t\tdie(_(\"error: cannot combine '--rebase_merges' with \"\n+\t\t\tdie(_(\"error: cannot combine '--rebase-merges' with \"\n \t\t\t      \"'--strategy-option'\"));\n \t\tif (options.strategy)\n-\t\t\tdie(_(\"error: cannot combine '--rebase_merges' with \"\n+\t\t\tdie(_(\"error: cannot combine '--rebase-merges' with \"\n \t\t\t      \"'--strategy'\"));\n \t}\n \n-- \n2.19.0-271-gfe8321ec05\n\n"}]}