# [PATCH v2] bisect: mention "view" as an alternative to "visualize" 3 messages from 2017-11-11 to 2017-11-11. Participants: Robert P. J. Day, Christian Couder. Thread: https://gitlist.dev/t/47165 ## Robert P. J. Day, 2017-11-11 10:31 Subject: [PATCH v2] bisect: mention "view" as an alternative to "visualize" Message-ID: URL: https://gitlist.dev/e/alpine.LFD.2.21.1711110528410.4314%40localhost.localdomain ``` Tweak a number of files to mention "view" as an alternative to "visualize". Signed-off-by: Robert P. J. Day --- Documentation/git-bisect.txt | 9 ++++----- Documentation/user-manual.txt | 3 ++- builtin/bisect--helper.c | 2 +- contrib/completion/git-completion.bash | 2 +- git-bisect.sh | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Documentation/git-bisect.txt b/Documentation/git-bisect.txt index 6c42abf07..3d333b9a7 100644 --- a/Documentation/git-bisect.txt +++ b/Documentation/git-bisect.txt @@ -23,7 +23,7 @@ on the subcommand: git bisect terms [--term-good | --term-bad] git bisect skip [(|)...] git bisect reset [] - git bisect visualize + git bisect (visualize|view) git bisect replay git bisect log git bisect run ... @@ -196,15 +196,14 @@ of `git bisect good` and `git bisect bad` to mark commits. Bisect visualize ~~~~~~~~~~~~~~~~ -To see the currently remaining suspects in 'gitk', issue the following -command during the bisection process: +To see the currently remaining suspects in 'gitk', issue either of the +following equivalent commands during the bisection process: ------------ $ git bisect visualize +$ git bisect view ------------ -`view` may also be used as a synonym for `visualize`. - If the `DISPLAY` environment variable is not set, 'git log' is used instead. You can also give command-line options such as `-p` and `--stat`. diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt index 3a03e63eb..55ec58986 100644 --- a/Documentation/user-manual.txt +++ b/Documentation/user-manual.txt @@ -538,10 +538,11 @@ Note that the version which `git bisect` checks out for you at each point is just a suggestion, and you're free to try a different version if you think it would be a good idea. For example, occasionally you may land on a commit that broke something unrelated; -run +run either of the equivalent commands ------------------------------------------------- $ git bisect visualize +$ git bisect view ------------------------------------------------- which will run gitk and label the commit it chose with a marker that diff --git a/builtin/bisect--helper.c b/builtin/bisect--helper.c index 35d2105f9..4b5fadcbe 100644 --- a/builtin/bisect--helper.c +++ b/builtin/bisect--helper.c @@ -46,7 +46,7 @@ static int check_term_format(const char *term, const char *orig_term) return error(_("'%s' is not a valid term"), term); if (one_of(term, "help", "start", "skip", "next", "reset", - "visualize", "replay", "log", "run", "terms", NULL)) + "visualize", "view", "replay", "log", "run", "terms", NULL)) return error(_("can't use the builtin command '%s' as a term"), term); /* diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index fdd984d34..52f68c922 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -1162,7 +1162,7 @@ _git_bisect () { __git_has_doubledash && return - local subcommands="start bad good skip reset visualize replay log run" + local subcommands="start bad good skip reset visualize view replay log run" local subcommand="$(__git_find_on_cmdline "$subcommands")" if [ -z "$subcommand" ]; then __git_find_repo_path diff --git a/git-bisect.sh b/git-bisect.sh index 0138a8860..a82256e34 100755 --- a/git-bisect.sh +++ b/git-bisect.sh @@ -1,6 +1,6 @@ #!/bin/sh -USAGE='[help|start|bad|good|new|old|terms|skip|next|reset|visualize|replay|log|run]' +USAGE='[help|start|bad|good|new|old|terms|skip|next|reset|visualize|view|replay|log|run]' LONG_USAGE='git bisect help print this long help message. git bisect start [--term-{old,good}= --term-{new,bad}=] @@ -20,7 +20,7 @@ git bisect next find next bisection to test and check it out. git bisect reset [] finish bisection search and go back to commit. -git bisect visualize +git bisect (visualize|view) show bisect status in gitk. git bisect replay replay bisection log. -- ======================================================================== Robert P. J. Day Ottawa, Ontario, CANADA http://crashcourse.ca Twitter: http://twitter.com/rpjday LinkedIn: http://ca.linkedin.com/in/rpjday ======================================================================== ``` ## Christian Couder, 2017-11-11 13:17 Subject: Re: [PATCH v2] bisect: mention "view" as an alternative to "visualize" Message-ID: URL: https://gitlist.dev/e/CAP8UFD2n18AauZbTWo9s3kaYJfMtCdYFTBS-RbyeemVGGpisGA%40mail.gmail.com In-Reply-To: ``` On Sat, Nov 11, 2017 at 11:31 AM, Robert P. J. Day wrote: > Tweak a number of files to mention "view" as an alternative to > "visualize". Good idea. > @@ -196,15 +196,14 @@ of `git bisect good` and `git bisect bad` to mark commits. > Bisect visualize > ~~~~~~~~~~~~~~~~ Maybe while at it the section title could be changed to "Bisect visualize/view". > -To see the currently remaining suspects in 'gitk', issue the following > -command during the bisection process: > +To see the currently remaining suspects in 'gitk', issue either of the > +following equivalent commands during the bisection process: > > ------------ > $ git bisect visualize > +$ git bisect view > ------------ > > -`view` may also be used as a synonym for `visualize`. I don't like very much the above changes. They don't make it clear that there is no difference between using "view" and using "visualize". > If the `DISPLAY` environment variable is not set, 'git log' is used > instead. You can also give command-line options such as `-p` and > `--stat`. > diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt > index 3a03e63eb..55ec58986 100644 > --- a/Documentation/user-manual.txt > +++ b/Documentation/user-manual.txt > @@ -538,10 +538,11 @@ Note that the version which `git bisect` checks out for you at each > point is just a suggestion, and you're free to try a different > version if you think it would be a good idea. For example, > occasionally you may land on a commit that broke something unrelated; > -run > +run either of the equivalent commands > > ------------------------------------------------- > $ git bisect visualize > +$ git bisect view > ------------------------------------------------- This is the user manual where we want to restrict the amount of information we give, so I am not a big fan of the above change. I think the other changes after the above are good though. Thanks, Christian ``` ## Robert P. J. Day, 2017-11-11 13:20 Subject: Re: [PATCH v2] bisect: mention "view" as an alternative to "visualize" Message-ID: URL: https://gitlist.dev/e/alpine.LFD.2.21.1711110820220.8941%40localhost.localdomain In-Reply-To: ``` ... snip ... ok, will rework. rday -- ======================================================================== Robert P. J. Day Ottawa, Ontario, CANADA http://crashcourse.ca Twitter: http://twitter.com/rpjday LinkedIn: http://ca.linkedin.com/in/rpjday ======================================================================== ```