{"thread":{"id":"47165","subject":"[PATCH v2] bisect: mention \"view\" as an alternative to \"visualize\"","startedAt":"2017-11-11T10:31:42Z","lastAt":"2017-11-11T13:21:02Z","messageCount":3,"participants":["Robert P. J. Day","Christian Couder"],"isPatch":true,"patchVersion":2,"patchTotal":null},"messages":[{"id":"332277","messageId":"alpine.LFD.2.21.1711110528410.4314@localhost.localdomain","threadId":"47165","inReplyTo":null,"subject":"[PATCH v2] bisect: mention \"view\" as an alternative to \"visualize\"","fromName":"Robert P. J. Day","fromEmail":"rpjday@crashcourse.ca","sentAt":"2017-11-11T10:31:10Z","receivedAt":"2017-11-11T10:31:42Z","isPatch":true,"sender":{"key":"rpjday@crashcourse.ca","avatar":"https://avatars.githubusercontent.com/u/226084077?v=4"},"body":"Tweak a number of files to mention \"view\" as an alternative to\n\"visualize\".\n\nSigned-off-by: Robert P. J. Day <rpjday@crashcourse.ca>\n\n---\n\n Documentation/git-bisect.txt           | 9 ++++-----\n Documentation/user-manual.txt          | 3 ++-\n builtin/bisect--helper.c               | 2 +-\n contrib/completion/git-completion.bash | 2 +-\n git-bisect.sh                          | 4 ++--\n 5 files changed, 10 insertions(+), 10 deletions(-)\n\ndiff --git a/Documentation/git-bisect.txt b/Documentation/git-bisect.txt\nindex 6c42abf07..3d333b9a7 100644\n--- a/Documentation/git-bisect.txt\n+++ b/Documentation/git-bisect.txt\n@@ -23,7 +23,7 @@ on the subcommand:\n  git bisect terms [--term-good | --term-bad]\n  git bisect skip [(<rev>|<range>)...]\n  git bisect reset [<commit>]\n- git bisect visualize\n+ git bisect (visualize|view)\n  git bisect replay <logfile>\n  git bisect log\n  git bisect run <cmd>...\n@@ -196,15 +196,14 @@ of `git bisect good` and `git bisect bad` to mark commits.\n Bisect visualize\n ~~~~~~~~~~~~~~~~\n\n-To see the currently remaining suspects in 'gitk', issue the following\n-command during the bisection process:\n+To see the currently remaining suspects in 'gitk', issue either of the\n+following equivalent commands during the bisection process:\n\n ------------\n $ git bisect visualize\n+$ git bisect view\n ------------\n\n-`view` may also be used as a synonym for `visualize`.\n-\n If the `DISPLAY` environment variable is not set, 'git log' is used\n instead.  You can also give command-line options such as `-p` and\n `--stat`.\ndiff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt\nindex 3a03e63eb..55ec58986 100644\n--- a/Documentation/user-manual.txt\n+++ b/Documentation/user-manual.txt\n@@ -538,10 +538,11 @@ Note that the version which `git bisect` checks out for you at each\n point is just a suggestion, and you're free to try a different\n version if you think it would be a good idea.  For example,\n occasionally you may land on a commit that broke something unrelated;\n-run\n+run either of the equivalent commands\n\n -------------------------------------------------\n $ git bisect visualize\n+$ git bisect view\n -------------------------------------------------\n\n which will run gitk and label the commit it chose with a marker that\ndiff --git a/builtin/bisect--helper.c b/builtin/bisect--helper.c\nindex 35d2105f9..4b5fadcbe 100644\n--- a/builtin/bisect--helper.c\n+++ b/builtin/bisect--helper.c\n@@ -46,7 +46,7 @@ static int check_term_format(const char *term, const char *orig_term)\n \t\treturn error(_(\"'%s' is not a valid term\"), term);\n\n \tif (one_of(term, \"help\", \"start\", \"skip\", \"next\", \"reset\",\n-\t\t\t\"visualize\", \"replay\", \"log\", \"run\", \"terms\", NULL))\n+\t\t\t\"visualize\", \"view\", \"replay\", \"log\", \"run\", \"terms\", NULL))\n \t\treturn error(_(\"can't use the builtin command '%s' as a term\"), term);\n\n \t/*\ndiff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash\nindex fdd984d34..52f68c922 100644\n--- a/contrib/completion/git-completion.bash\n+++ b/contrib/completion/git-completion.bash\n@@ -1162,7 +1162,7 @@ _git_bisect ()\n {\n \t__git_has_doubledash && return\n\n-\tlocal subcommands=\"start bad good skip reset visualize replay log run\"\n+\tlocal subcommands=\"start bad good skip reset visualize view replay log run\"\n \tlocal subcommand=\"$(__git_find_on_cmdline \"$subcommands\")\"\n \tif [ -z \"$subcommand\" ]; then\n \t\t__git_find_repo_path\ndiff --git a/git-bisect.sh b/git-bisect.sh\nindex 0138a8860..a82256e34 100755\n--- a/git-bisect.sh\n+++ b/git-bisect.sh\n@@ -1,6 +1,6 @@\n #!/bin/sh\n\n-USAGE='[help|start|bad|good|new|old|terms|skip|next|reset|visualize|replay|log|run]'\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@@ -20,7 +20,7 @@ git bisect next\n \tfind next bisection to test and check it out.\n git bisect reset [<commit>]\n \tfinish bisection search and go back to commit.\n-git bisect visualize\n+git bisect (visualize|view)\n \tshow bisect status in gitk.\n git bisect replay <logfile>\n \treplay bisection log.\n\n\n-- \n\n========================================================================\nRobert P. J. Day                                 Ottawa, Ontario, CANADA\n                        http://crashcourse.ca\n\nTwitter:                                       http://twitter.com/rpjday\nLinkedIn:                               http://ca.linkedin.com/in/rpjday\n========================================================================\n"},{"id":"332281","messageId":"CAP8UFD2n18AauZbTWo9s3kaYJfMtCdYFTBS-RbyeemVGGpisGA@mail.gmail.com","threadId":"47165","inReplyTo":"alpine.LFD.2.21.1711110528410.4314@localhost.localdomain","subject":"Re: [PATCH v2] bisect: mention \"view\" as an alternative to \"visualize\"","fromName":"Christian Couder","fromEmail":"christian.couder@gmail.com","sentAt":"2017-11-11T13:17:59Z","receivedAt":"2017-11-11T13:18:04Z","isPatch":true,"sender":{"key":"christian.couder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/208954?v=4"},"body":"On Sat, Nov 11, 2017 at 11:31 AM, Robert P. J. Day\n<rpjday@crashcourse.ca> wrote:\n> Tweak a number of files to mention \"view\" as an alternative to\n> \"visualize\".\n\nGood idea.\n\n> @@ -196,15 +196,14 @@ of `git bisect good` and `git bisect bad` to mark commits.\n>  Bisect visualize\n>  ~~~~~~~~~~~~~~~~\n\nMaybe while at it the section title could be changed to \"Bisect visualize/view\".\n\n> -To see the currently remaining suspects in 'gitk', issue the following\n> -command during the bisection process:\n> +To see the currently remaining suspects in 'gitk', issue either of the\n> +following equivalent commands during the bisection process:\n>\n>  ------------\n>  $ git bisect visualize\n> +$ git bisect view\n>  ------------\n>\n> -`view` may also be used as a synonym for `visualize`.\n\nI don't like very much the above changes. They don't make it clear\nthat there is no difference between using \"view\" and using\n\"visualize\".\n\n>  If the `DISPLAY` environment variable is not set, 'git log' is used\n>  instead.  You can also give command-line options such as `-p` and\n>  `--stat`.\n> diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt\n> index 3a03e63eb..55ec58986 100644\n> --- a/Documentation/user-manual.txt\n> +++ b/Documentation/user-manual.txt\n> @@ -538,10 +538,11 @@ Note that the version which `git bisect` checks out for you at each\n>  point is just a suggestion, and you're free to try a different\n>  version if you think it would be a good idea.  For example,\n>  occasionally you may land on a commit that broke something unrelated;\n> -run\n> +run either of the equivalent commands\n>\n>  -------------------------------------------------\n>  $ git bisect visualize\n> +$ git bisect view\n>  -------------------------------------------------\n\nThis is the user manual where we want to restrict the amount of\ninformation we give, so I am not a big fan of the above change.\n\nI think the other changes after the above are good though.\n\nThanks,\nChristian\n"},{"id":"332282","messageId":"alpine.LFD.2.21.1711110820220.8941@localhost.localdomain","threadId":"47165","inReplyTo":"CAP8UFD2n18AauZbTWo9s3kaYJfMtCdYFTBS-RbyeemVGGpisGA@mail.gmail.com","subject":"Re: [PATCH v2] bisect: mention \"view\" as an alternative to \"visualize\"","fromName":"Robert P. J. Day","fromEmail":"rpjday@crashcourse.ca","sentAt":"2017-11-11T13:20:34Z","receivedAt":"2017-11-11T13:21:02Z","isPatch":true,"sender":{"key":"rpjday@crashcourse.ca","avatar":"https://avatars.githubusercontent.com/u/226084077?v=4"},"body":"\n  ... snip ...\n\nok, will rework.\n\nrday\n\n-- \n\n========================================================================\nRobert P. J. Day                                 Ottawa, Ontario, CANADA\n                        http://crashcourse.ca\n\nTwitter:                                       http://twitter.com/rpjday\nLinkedIn:                               http://ca.linkedin.com/in/rpjday\n========================================================================\n"}]}