{"thread":{"id":"54153","subject":"[PATCH] bisect: swap command-line options in documentation","startedAt":"2020-08-28T15:31:25Z","lastAt":"2020-08-28T21:05:38Z","messageCount":2,"participants":["Hugo Locurcio via GitGitGadget","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"404702","messageId":"pull.711.git.1598628679830.gitgitgadget@gmail.com","threadId":"54153","inReplyTo":null,"subject":"[PATCH] bisect: swap command-line options in documentation","fromName":"Hugo Locurcio via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2020-08-28T15:31:19Z","receivedAt":"2020-08-28T15:31:25Z","isPatch":true,"sender":{"key":"name:Hugo Locurcio","avatar":null},"body":"From: Hugo Locurcio <hugo.locurcio@hugo.pro>\n\nThe positional arguments are specified in this order: \"bad\" then \"good\".\nTo avoid confusion, the options above the positional arguments\nare now specified in the same order. They can still be specified in any\norder since they're options, not positional arguments.\n\nSigned-off-by: Hugo Locurcio <hugo.locurcio@hugo.pro>\n---\n    rebase: swap command-line options in documentation\n    \n    I wasted an hour because I thought I'd have to specify \"good\" then \"bad\"\n    since I followed the order of the options instead of the positional\n    arguments. Let's make this harder to happen in the future :)\n\nPublished-As: https://github.com/gitgitgadget/git/releases/tag/pr-711%2FCalinou%2Frebase-doc-swap-options-v1\nFetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-711/Calinou/rebase-doc-swap-options-v1\nPull-Request: https://github.com/gitgitgadget/git/pull/711\n\n Documentation/git-bisect.txt | 2 +-\n builtin/bisect--helper.c     | 2 +-\n git-bisect.sh                | 2 +-\n 3 files changed, 3 insertions(+), 3 deletions(-)\n\ndiff --git a/Documentation/git-bisect.txt b/Documentation/git-bisect.txt\nindex 0e993e4587..fbb39fbdf5 100644\n--- a/Documentation/git-bisect.txt\n+++ b/Documentation/git-bisect.txt\n@@ -16,7 +16,7 @@ DESCRIPTION\n The command takes various subcommands, and different options depending\n on the subcommand:\n \n- git bisect start [--term-{old,good}=<term> --term-{new,bad}=<term>]\n+ git bisect start [--term-{new,bad}=<term> --term-{old,good}=<term>]\n \t\t  [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] [<paths>...]\n  git bisect (bad|new|<term-new>) [<rev>]\n  git bisect (good|old|<term-old>) [<rev>...]\ndiff --git a/builtin/bisect--helper.c b/builtin/bisect--helper.c\nindex cdda279b23..7dcc1b5188 100644\n--- a/builtin/bisect--helper.c\n+++ b/builtin/bisect--helper.c\n@@ -27,7 +27,7 @@ static const char * const git_bisect_helper_usage[] = {\n \tN_(\"git bisect--helper --bisect-check-and-set-terms <command> <good_term> <bad_term>\"),\n \tN_(\"git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]\"),\n \tN_(\"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --term-new]\"),\n-\tN_(\"git bisect--helper --bisect-start [--term-{old,good}=<term> --term-{new,bad}=<term>]\"\n+\tN_(\"git bisect--helper --bisect-start [--term-{new,bad}=<term> --term-{old,good}=<term>]\"\n \t\t\t\t\t    \" [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] [<paths>...]\"),\n \tNULL\n };\ndiff --git a/git-bisect.sh b/git-bisect.sh\nindex c7580e51a0..3ec7558bdc 100755\n--- a/git-bisect.sh\n+++ b/git-bisect.sh\n@@ -3,7 +3,7 @@\n USAGE='[help|start|bad|good|new|old|terms|skip|next|reset|visualize|view|replay|log|run]'\n LONG_USAGE='git bisect help\n \tprint this long help message.\n-git bisect start [--term-{old,good}=<term> --term-{new,bad}=<term>]\n+git bisect start [--term-{new,bad}=<term> --term-{old,good}=<term>]\n \t\t [--no-checkout] [<bad> [<good>...]] [--] [<pathspec>...]\n \treset bisect state and start bisection.\n git bisect (bad|new) [<rev>]\n\nbase-commit: 20de7e7e4f4e9ae52e6cc7cfaa6469f186ddb0fa\n-- \ngitgitgadget\n"},{"id":"404731","messageId":"xmqqbliuo50n.fsf@gitster.c.googlers.com","threadId":"54153","inReplyTo":"pull.711.git.1598628679830.gitgitgadget@gmail.com","subject":"Re: [PATCH] bisect: swap command-line options in documentation","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2020-08-28T21:05:28Z","receivedAt":"2020-08-28T21:05:38Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"Hugo Locurcio via GitGitGadget\" <gitgitgadget@gmail.com> writes:\n\n> + git bisect start [--term-{new,bad}=<term> --term-{old,good}=<term>]\n>  \t\t  [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] [<paths>...]\n\nYeah, matching the --term-{bad,good} and the actual arguments may\nmake it easier to see the correspondence between them.  Good idea.\n\nIn the old days, back when there weren't \"--term-*=<myword>\", it was\nmuch simpler.  All people have to do was to remember that <bad> and\n<good> are ordered alphabetically.\n\nWill queue.  Thanks.\n"}]}