| Message ID | 042271990895c4cfdedb20c3aed3d4141df610bd.1691122124.git.gitgitgadget@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | git bisect visualize: find gitk on Windows again | expand |
"Matthias Aßhauer via GitGitGadget" <gitgitgadget@gmail.com> writes: > From: =?UTF-8?q?Matthias=20A=C3=9Fhauer?= <mha1993@live.de> > > This check has involved more environment variables than just `DISPLAY` since > 508e84a790 (bisect view: check for MinGW32 and MacOSX in addition to X11, > 2008-02-14), so let's update the documentation accordingly. > > Signed-off-by: Matthias Aßhauer <mha1993@live.de> > --- > Documentation/git-bisect.txt | 11 ++++++++--- > 1 file changed, 8 insertions(+), 3 deletions(-) > > diff --git a/Documentation/git-bisect.txt b/Documentation/git-bisect.txt > index fbb39fbdf5d..bec8d2abb22 100644 > --- a/Documentation/git-bisect.txt > +++ b/Documentation/git-bisect.txt > @@ -204,9 +204,14 @@ as an alternative to `visualize`): > $ git bisect 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`. > +Git detects a graphical environment through various environment variables: > +`DISPLAY`, which is set in X Window System environments on Unix systems. > +`SESSIONNAME`, which is set under Cygwin in interactive desktop sessions. > +`MSYSTEM`, which is set under Msys2 and Git for Windows. > +`SECURITYSESSIONID`, which is set on macOS in interactive desktop sessions. Great. > +If none of these environment variables is set, 'git log' is used instead. > +You can also give command-line options such as `-p` and `--stat`. Micronit. I think "is set" want to be "are set", as "none" in "none of these" is used for "not any" [*]. > > ------------ > $ git bisect visualize --stat [Reference] * https://www.merriam-webster.com/video/is-none-singular-or-plural
On Fri, Aug 4, 2023 at 1:22 AM Matthias Aßhauer via GitGitGadget <gitgitgadget@gmail.com> wrote: > This check has involved more environment variables than just `DISPLAY` since > 508e84a790 (bisect view: check for MinGW32 and MacOSX in addition to X11, > 2008-02-14), so let's update the documentation accordingly. > > Signed-off-by: Matthias Aßhauer <mha1993@live.de> > --- > diff --git a/Documentation/git-bisect.txt b/Documentation/git-bisect.txt > @@ -204,9 +204,14 @@ as an alternative to `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`. > +Git detects a graphical environment through various environment variables: > +`DISPLAY`, which is set in X Window System environments on Unix systems. > +`SESSIONNAME`, which is set under Cygwin in interactive desktop sessions. > +`MSYSTEM`, which is set under Msys2 and Git for Windows. > +`SECURITYSESSIONID`, which is set on macOS in interactive desktop sessions. Micronit: SECURITYSESSIONID is not universal on macOS[1]; some people report its presence in iTerm2 and HyperTerm, and perhaps even Apple's own Terminal (although it's not defined for me in Terminal on High Sierra). Perhaps just say "may be set on macOS". Probably not worth a reroll. [1]: https://github.com/vercel/hyper/issues/482
On Fri, 4 Aug 2023, Eric Sunshine wrote: > On Fri, Aug 4, 2023 at 1:22 AM Matthias Aßhauer via GitGitGadget > <gitgitgadget@gmail.com> wrote: >> This check has involved more environment variables than just `DISPLAY` since >> 508e84a790 (bisect view: check for MinGW32 and MacOSX in addition to X11, >> 2008-02-14), so let's update the documentation accordingly. >> >> Signed-off-by: Matthias Aßhauer <mha1993@live.de> >> --- >> diff --git a/Documentation/git-bisect.txt b/Documentation/git-bisect.txt >> @@ -204,9 +204,14 @@ as an alternative to `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`. >> +Git detects a graphical environment through various environment variables: >> +`DISPLAY`, which is set in X Window System environments on Unix systems. >> +`SESSIONNAME`, which is set under Cygwin in interactive desktop sessions. >> +`MSYSTEM`, which is set under Msys2 and Git for Windows. >> +`SECURITYSESSIONID`, which is set on macOS in interactive desktop sessions. > > Micronit: SECURITYSESSIONID is not universal on macOS[1]; some people > report its presence in iTerm2 and HyperTerm, and perhaps even Apple's > own Terminal (although it's not defined for me in Terminal on High > Sierra). Perhaps just say "may be set on macOS". I've just checked in Terminal on Ventura and it isn't set for me either. I'll reword it. > Probably not worth a reroll. > > [1]: https://github.com/vercel/hyper/issues/482 >
Matthias Aßhauer <mha1993@live.de> writes: > On Fri, 4 Aug 2023, Eric Sunshine wrote: > >> On Fri, Aug 4, 2023 at 1:22 AM Matthias Aßhauer via GitGitGadget >> <gitgitgadget@gmail.com> wrote: >>> This check has involved more environment variables than just `DISPLAY` since >>> 508e84a790 (bisect view: check for MinGW32 and MacOSX in addition to X11, >>> 2008-02-14), so let's update the documentation accordingly. >>> >>> Signed-off-by: Matthias Aßhauer <mha1993@live.de> >>> --- >>> diff --git a/Documentation/git-bisect.txt b/Documentation/git-bisect.txt >>> @@ -204,9 +204,14 @@ as an alternative to `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`. >>> +Git detects a graphical environment through various environment variables: >>> +`DISPLAY`, which is set in X Window System environments on Unix systems. >>> +`SESSIONNAME`, which is set under Cygwin in interactive desktop sessions. >>> +`MSYSTEM`, which is set under Msys2 and Git for Windows. >>> +`SECURITYSESSIONID`, which is set on macOS in interactive desktop sessions. >> >> Micronit: SECURITYSESSIONID is not universal on macOS[1]; some people >> report its presence in iTerm2 and HyperTerm, and perhaps even Apple's >> own Terminal (although it's not defined for me in Terminal on High >> Sierra). Perhaps just say "may be set on macOS". > > I've just checked in Terminal on Ventura and it isn't set for me either. > I'll reword it. I'll locally tweak "which may be set on macOS" for now. It should be good enough for the upcoming release, right?
On Fri, Aug 4, 2023 at 12:45 PM Junio C Hamano <gitster@pobox.com> wrote: > Matthias Aßhauer <mha1993@live.de> writes: > > On Fri, 4 Aug 2023, Eric Sunshine wrote: > >> On Fri, Aug 4, 2023 at 1:22 AM Matthias Aßhauer via GitGitGadget > >> <gitgitgadget@gmail.com> wrote: > >>> +Git detects a graphical environment through various environment variables: > >>> +`DISPLAY`, which is set in X Window System environments on Unix systems. > >>> +`SESSIONNAME`, which is set under Cygwin in interactive desktop sessions. > >>> +`MSYSTEM`, which is set under Msys2 and Git for Windows. > >>> +`SECURITYSESSIONID`, which is set on macOS in interactive desktop sessions. > >> > >> Micronit: SECURITYSESSIONID is not universal on macOS[1]; some people > >> report its presence in iTerm2 and HyperTerm, and perhaps even Apple's > >> own Terminal (although it's not defined for me in Terminal on High > >> Sierra). Perhaps just say "may be set on macOS". > > > > I've just checked in Terminal on Ventura and it isn't set for me either. > > I'll reword it. > > I'll locally tweak "which may be set on macOS" for now. It should > be good enough for the upcoming release, right? I would think so.
diff --git a/Documentation/git-bisect.txt b/Documentation/git-bisect.txt index fbb39fbdf5d..bec8d2abb22 100644 --- a/Documentation/git-bisect.txt +++ b/Documentation/git-bisect.txt @@ -204,9 +204,14 @@ as an alternative to `visualize`): $ git bisect 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`. +Git detects a graphical environment through various environment variables: +`DISPLAY`, which is set in X Window System environments on Unix systems. +`SESSIONNAME`, which is set under Cygwin in interactive desktop sessions. +`MSYSTEM`, which is set under Msys2 and Git for Windows. +`SECURITYSESSIONID`, which is set on macOS in interactive desktop sessions. + +If none of these environment variables is set, 'git log' is used instead. +You can also give command-line options such as `-p` and `--stat`. ------------ $ git bisect visualize --stat