# [PATCH 0/1] DiffHighlight.pm: Use correct /dev/null for UNIX and Windows 18 messages from 2018-10-30 to 2019-05-12. Participants: Chris. Webster via GitGitGadget, chris via GitGitGadget, Jeff King, Junio C Hamano, Chris Webster, Johannes Schindelin, Git Gadget, Philip Oakley. Thread: https://gitlist.dev/t/49716 ## Chris. Webster via GitGitGadget, 2018-10-30 18:26 Subject: [PATCH 0/1] DiffHighlight.pm: Use correct /dev/null for UNIX and Windows Message-ID: URL: https://gitlist.dev/e/pull.59.git.gitgitgadget%40gmail.com ``` Use File::Spec->devnull() for output redirection to avoid messages when Windows version of Perl is first in path. The message 'The system cannot find the path specified.' is displayed each time git is run to get colors. chris (1): Use correct /dev/null for UNIX and Windows contrib/diff-highlight/DiffHighlight.pm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) base-commit: c670b1f876521c9f7cd40184bf7ed05aad843433 Published-As: https://github.com/gitgitgadget/git/releases/tags/pr-59%2Fwebstech%2Fmaster-v1 Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-59/webstech/master-v1 Pull-Request: https://github.com/gitgitgadget/git/pull/59 -- gitgitgadget ``` ## chris via GitGitGadget, 2018-10-30 18:26 Subject: [PATCH 1/1] Use correct /dev/null for UNIX and Windows Message-ID: <8159cbd1b8025f33fb9d0e254db1a3c2a066f853.1540923993.git.gitgitgadget@gmail.com> URL: https://gitlist.dev/e/8159cbd1b8025f33fb9d0e254db1a3c2a066f853.1540923993.git.gitgitgadget%40gmail.com In-Reply-To: ``` From: chris Use File::Spec->devnull() for output redirection to avoid messages when Windows version of Perl is first in path. The message 'The system cannot find the path specified.' is displayed each time git is run to get colors. Signed-off-by: Chris. Webster --- contrib/diff-highlight/DiffHighlight.pm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/contrib/diff-highlight/DiffHighlight.pm b/contrib/diff-highlight/DiffHighlight.pm index 536754583..7440aa1c4 100644 --- a/contrib/diff-highlight/DiffHighlight.pm +++ b/contrib/diff-highlight/DiffHighlight.pm @@ -4,6 +4,11 @@ use 5.008; use warnings FATAL => 'all'; use strict; +# Use the correct value for both UNIX and Windows (/dev/null vs nul) +use File::Spec; + +my $NULL = File::Spec->devnull(); + # Highlight by reversing foreground and background. You could do # other things like bold or underline if you prefer. my @OLD_HIGHLIGHT = ( @@ -134,7 +139,7 @@ sub highlight_stdin { # fallback, which means we will work even if git can't be run. sub color_config { my ($key, $default) = @_; - my $s = `git config --get-color $key 2>/dev/null`; + my $s = `git config --get-color $key 2>$NULL`; return length($s) ? $s : $default; } -- gitgitgadget ``` ## Jeff King, 2018-10-31 03:56 Subject: Re: [PATCH 1/1] Use correct /dev/null for UNIX and Windows Message-ID: <20181031035618.GA31247@sigill.intra.peff.net> URL: https://gitlist.dev/e/20181031035618.GA31247%40sigill.intra.peff.net In-Reply-To: <8159cbd1b8025f33fb9d0e254db1a3c2a066f853.1540923993.git.gitgitgadget@gmail.com> ``` On Tue, Oct 30, 2018 at 11:26:36AM -0700, chris via GitGitGadget wrote: > From: chris You might want to adjust your user.name. :) > Use File::Spec->devnull() for output redirection to avoid messages > when Windows version of Perl is first in path. The message 'The > system cannot find the path specified.' is displayed each time git is > run to get colors. Thanks, makes sense, and the patch looks good to me. -Peff ``` ## Junio C Hamano, 2018-10-31 04:48 Subject: Re: [PATCH 1/1] Use correct /dev/null for UNIX and Windows Message-ID: URL: https://gitlist.dev/e/xmqqy3aewwky.fsf%40gitster-ct.c.googlers.com In-Reply-To: <20181031035618.GA31247@sigill.intra.peff.net> ``` Jeff King writes: > On Tue, Oct 30, 2018 at 11:26:36AM -0700, chris via GitGitGadget wrote: > >> From: chris > > You might want to adjust your user.name. :) Yes, absolutely. We'd want to see that the From: line and one of the Signed-off-by: lines are idential. >> Use File::Spec->devnull() for output redirection to avoid messages >> when Windows version of Perl is first in path. The message 'The >> system cannot find the path specified.' is displayed each time git is >> run to get colors. > > Thanks, makes sense, and the patch looks good to me. Yup, and we already use File::Spec everywhere anyway, so this is not a new dependency, either. Which is very good. ``` ## Junio C Hamano, 2018-10-31 04:54 Subject: Re: [PATCH 1/1] Use correct /dev/null for UNIX and Windows Message-ID: URL: https://gitlist.dev/e/xmqqsh0mwwah.fsf%40gitster-ct.c.googlers.com In-Reply-To: <8159cbd1b8025f33fb9d0e254db1a3c2a066f853.1540923993.git.gitgitgadget@gmail.com> ``` "chris via GitGitGadget" writes: > From: chris > > Use File::Spec->devnull() for output redirection to avoid messages > when Windows version of Perl is first in path. The message 'The Dscho, "Windows version of Perl is first in path" somehow feels contradicting with what one of the topics I saw from you were trying to enforce (or, at least, "set as the supported configuration"). I am guessing that the Perl you are building and shipping with Git for Windows would yield what the shell that ends up running the scriptlet `git config --get-color $key` prefers when asked for File::Spec->devnull(), and nothing will break with this patch even if that is "/dev/null", but I thought I'd double check. Thanks. > system cannot find the path specified.' is displayed each time git is > run to get colors. > > Signed-off-by: Chris. Webster > --- > contrib/diff-highlight/DiffHighlight.pm | 7 ++++++- > 1 file changed, 6 insertions(+), 1 deletion(-) > > diff --git a/contrib/diff-highlight/DiffHighlight.pm b/contrib/diff-highlight/DiffHighlight.pm > index 536754583..7440aa1c4 100644 > --- a/contrib/diff-highlight/DiffHighlight.pm > +++ b/contrib/diff-highlight/DiffHighlight.pm > @@ -4,6 +4,11 @@ use 5.008; > use warnings FATAL => 'all'; > use strict; > > +# Use the correct value for both UNIX and Windows (/dev/null vs nul) > +use File::Spec; > + > +my $NULL = File::Spec->devnull(); > + > # Highlight by reversing foreground and background. You could do > # other things like bold or underline if you prefer. > my @OLD_HIGHLIGHT = ( > @@ -134,7 +139,7 @@ sub highlight_stdin { > # fallback, which means we will work even if git can't be run. > sub color_config { > my ($key, $default) = @_; > - my $s = `git config --get-color $key 2>/dev/null`; > + my $s = `git config --get-color $key 2>$NULL`; > return length($s) ? $s : $default; > } ``` ## Junio C Hamano, 2018-10-31 05:07 Subject: Re: [PATCH 1/1] Use correct /dev/null for UNIX and Windows Message-ID: URL: https://gitlist.dev/e/xmqqo9bawvpf.fsf%40gitster-ct.c.googlers.com In-Reply-To: <8159cbd1b8025f33fb9d0e254db1a3c2a066f853.1540923993.git.gitgitgadget@gmail.com> ``` > Subject: Re: [PATCH 1/1] Use correct /dev/null for UNIX and Windows As this is only about contrib/diff-highlight, please make it clear that it is the area the patch affects on its title, i.e. Subject: diff-highlight: use File::Spec->devnull(), not /dev/null or something like that. > From: chris Please make this line read like From: Chris Webster i.e. the author should be the person who is signing off that patch. > Use File::Spec->devnull() for output redirection to avoid messages > when Windows version of Perl is first in path. The message 'The > system cannot find the path specified.' is displayed each time git is > run to get colors. > > Signed-off-by: Chris. Webster > --- > contrib/diff-highlight/DiffHighlight.pm | 7 ++++++- > 1 file changed, 6 insertions(+), 1 deletion(-) There are a handful more instances of /dev/null found if you do $ git grep /dev/null -- \*.pl \*.pm The one in perl/Git.pm must be shared by scripts written in Perl, so it may be worth giving the same tweak to it, like this patch does to the highlight script. > diff --git a/contrib/diff-highlight/DiffHighlight.pm b/contrib/diff-highlight/DiffHighlight.pm > index 536754583..7440aa1c4 100644 > --- a/contrib/diff-highlight/DiffHighlight.pm > +++ b/contrib/diff-highlight/DiffHighlight.pm > @@ -4,6 +4,11 @@ use 5.008; > use warnings FATAL => 'all'; > use strict; > > +# Use the correct value for both UNIX and Windows (/dev/null vs nul) > +use File::Spec; > + > +my $NULL = File::Spec->devnull(); > + > # Highlight by reversing foreground and background. You could do > # other things like bold or underline if you prefer. > my @OLD_HIGHLIGHT = ( > @@ -134,7 +139,7 @@ sub highlight_stdin { > # fallback, which means we will work even if git can't be run. > sub color_config { > my ($key, $default) = @_; > - my $s = `git config --get-color $key 2>/dev/null`; > + my $s = `git config --get-color $key 2>$NULL`; > return length($s) ? $s : $default; > } ``` ## Chris Webster, 2018-10-31 05:41 Subject: Re: [PATCH 1/1] Use correct /dev/null for UNIX and Windows Message-ID: URL: https://gitlist.dev/e/CAGT1KpWC_%2B%3Du7fCzQJsU8d_gSQzE5rsx46cTXogvaRPHZ1iiHw%40mail.gmail.com In-Reply-To: ``` Resending in text mode. On Tue, Oct 30, 2018 at 10:20 PM Chris Webster wrote: > > On Tue, Oct 30, 2018 at 9:54 PM Junio C Hamano wrote: >> >> "chris via GitGitGadget" writes: >> >> > From: chris >> > >> > Use File::Spec->devnull() for output redirection to avoid messages >> > when Windows version of Perl is first in path. The message 'The >> >> Dscho, "Windows version of Perl is first in path" somehow feels >> contradicting with what one of the topics I saw from you were trying >> to enforce (or, at least, "set as the supported configuration"). >> >> I am guessing that the Perl you are building and shipping with Git >> for Windows would yield what the shell that ends up running the >> scriptlet `git config --get-color $key` prefers when asked for >> File::Spec->devnull(), and nothing will break with this patch even >> if that is "/dev/null", but I thought I'd double check. >> >> Thanks. >> This problem originally showed up in the https://github.com/so-fancy/diff-so-fancy project, which has a copy of DiffHighlight.pm. That project allows diffsofancy (perl) to be run from the command line without requiring the bash environment ((well , sort of) including the associated perl). > >> > system cannot find the path specified.' is displayed each time git is >> > run to get colors. >> > >> > Signed-off-by: Chris. Webster >> > --- >> > contrib/diff-highlight/DiffHighlight.pm | 7 ++++++- >> > 1 file changed, 6 insertions(+), 1 deletion(-) >> > >> > diff --git a/contrib/diff-highlight/DiffHighlight.pm b/contrib/diff-highlight/DiffHighlight.pm >> > index 536754583..7440aa1c4 100644 >> > --- a/contrib/diff-highlight/DiffHighlight.pm >> > +++ b/contrib/diff-highlight/DiffHighlight.pm >> > @@ -4,6 +4,11 @@ use 5.008; >> > use warnings FATAL => 'all'; >> > use strict; >> > >> > +# Use the correct value for both UNIX and Windows (/dev/null vs nul) >> > +use File::Spec; >> > + >> > +my $NULL = File::Spec->devnull(); >> > + >> > # Highlight by reversing foreground and background. You could do >> > # other things like bold or underline if you prefer. >> > my @OLD_HIGHLIGHT = ( >> > @@ -134,7 +139,7 @@ sub highlight_stdin { >> > # fallback, which means we will work even if git can't be run. >> > sub color_config { >> > my ($key, $default) = @_; >> > - my $s = `git config --get-color $key 2>/dev/null`; >> > + my $s = `git config --get-color $key 2>$NULL`; >> > return length($s) ? $s : $default; >> > } ``` ## Junio C Hamano, 2018-10-31 06:08 Subject: Re: [PATCH 1/1] Use correct /dev/null for UNIX and Windows Message-ID: URL: https://gitlist.dev/e/xmqqbm7awsvr.fsf%40gitster-ct.c.googlers.com In-Reply-To: ``` Chris Webster writes: >>> > Use File::Spec->devnull() for output redirection to avoid messages >>> > when Windows version of Perl is first in path. The message 'The >>> >>> Dscho, "Windows version of Perl is first in path" somehow feels >>> contradicting with what one of the topics I saw from you were trying >>> to enforce (or, at least, "set as the supported configuration"). >>> >>> I am guessing that the Perl you are building and shipping with Git >>> for Windows would yield what the shell that ends up running the >>> scriptlet `git config --get-color $key` prefers when asked for >>> File::Spec->devnull(), and nothing will break with this patch even >>> if that is "/dev/null", but I thought I'd double check. >>> >>> Thanks. >>> > This problem originally showed up in the > https://github.com/so-fancy/diff-so-fancy project, which has a copy of > DiffHighlight.pm. That project allows diffsofancy (perl) to be run > from the command line without requiring the bash environment ((well , > sort of) including the associated perl). Thanks for additional comments. In any case, Windows is not my bailiwick, so I'll hope that the above comments from you would help Dscho in his response and wait. I know use of File::Spec->devnull() won't hurt POSIX folks so making sure this won't break Git for Windows is the primary thing I woudl worry about this patch. ``` ## Johannes Schindelin, 2018-10-31 11:10 Subject: Re: [PATCH 1/1] Use correct /dev/null for UNIX and Windows Message-ID: URL: https://gitlist.dev/e/nycvar.QRO.7.76.6.1810311206230.4546%40tvgsbejvaqbjf.bet In-Reply-To: ``` Hi Junio, On Wed, 31 Oct 2018, Junio C Hamano wrote: > Chris Webster writes: > > >>> > Use File::Spec->devnull() for output redirection to avoid messages > >>> > when Windows version of Perl is first in path. The message 'The > >>> > >>> Dscho, "Windows version of Perl is first in path" somehow feels > >>> contradicting with what one of the topics I saw from you were trying > >>> to enforce (or, at least, "set as the supported configuration"). > >>> > >>> I am guessing that the Perl you are building and shipping with Git > >>> for Windows would yield what the shell that ends up running the > >>> scriptlet `git config --get-color $key` prefers when asked for > >>> File::Spec->devnull(), and nothing will break with this patch even > >>> if that is "/dev/null", but I thought I'd double check. > >>> > >>> Thanks. > >>> > > This problem originally showed up in the > > https://github.com/so-fancy/diff-so-fancy project, which has a copy of > > DiffHighlight.pm. That project allows diffsofancy (perl) to be run > > from the command line without requiring the bash environment ((well , > > sort of) including the associated perl). > > Thanks for additional comments. > > In any case, Windows is not my bailiwick, so I'll hope that the > above comments from you would help Dscho in his response and wait. > I know use of File::Spec->devnull() won't hurt POSIX folks so making > sure this won't break Git for Windows is the primary thing I woudl > worry about this patch. Indeed, the patch in question regards something I consider outside Git for Windows' realm. As Chris said, you can run this script from a PowerShell prompt, without any Git Bash (and without Git's Perl) involved. I am fine with this patch, as long as the author name is fixed to match the name in the Signed-off-by: footer ;-) [*1*] Ciao, Dscho Footnote *1*: This patch came in via GitGitGadget, and if I had infinite amounts of time, I would probably implement some rudimentary pre-checks, such as: does the Author: header match the first Signed-off-by: footer, is the commit message wrapped correctly, does the oneline have a prefix and continues lower-case, etc. And GitGitGadget would then point out the issues, possibly even try to fix them and push up the fixed commits. If anybody agrees with these goals and is curious enough to dive into some Typescript programming, I'd be very happy to guide that person through implementing this ;-) ``` ## Johannes Schindelin, 2018-10-31 11:14 Subject: Re: [PATCH 1/1] Use correct /dev/null for UNIX and Windows Message-ID: URL: https://gitlist.dev/e/nycvar.QRO.7.76.6.1810311210410.4546%40tvgsbejvaqbjf.bet In-Reply-To: ``` Hi, On Wed, 31 Oct 2018, Junio C Hamano wrote: > > From: chris > > Please make this line read like > > From: Chris Webster > > i.e. the author should be the person who is signing off that patch. This is most likely recorded as the commit's author in the commit object... Chris, to fix it, make sure that your `user.name` is configured correctly, and then call `git commit --amend --reset-author`. > > Use File::Spec->devnull() for output redirection to avoid messages > > when Windows version of Perl is first in path. The message 'The > > system cannot find the path specified.' is displayed each time git is > > run to get colors. > > > > Signed-off-by: Chris. Webster > > --- > > contrib/diff-highlight/DiffHighlight.pm | 7 ++++++- > > 1 file changed, 6 insertions(+), 1 deletion(-) > > There are a handful more instances of /dev/null found if you do > > $ git grep /dev/null -- \*.pl \*.pm > > The one in perl/Git.pm must be shared by scripts written in Perl, so > it may be worth giving the same tweak to it, like this patch does to > the highlight script. I do not think that perl/Git.pm is intended to run with any random Perl interpreter. It has to be one that has been verified to work correctly with the Perl code in perl/, and that code is notoriously reliant on POSIX behavior, hence our choice to go with MSYS2 Perl (there *is* a MINGW Perl package in Git for Windows' SDK, but it will most likely not work, in particular because of the missing Subversion bindings). So I would restrict the search to contrib/\*.pl, contrib/\*.perl and contrib/\*.pm. The stuff in contrib/ is supposed to be semi-independent from the particular Git one is using (and from whatever Perl is shipped with it, if any). Ciao, Johannes > > diff --git a/contrib/diff-highlight/DiffHighlight.pm b/contrib/diff-highlight/DiffHighlight.pm > > index 536754583..7440aa1c4 100644 > > --- a/contrib/diff-highlight/DiffHighlight.pm > > +++ b/contrib/diff-highlight/DiffHighlight.pm > > @@ -4,6 +4,11 @@ use 5.008; > > use warnings FATAL => 'all'; > > use strict; > > > > +# Use the correct value for both UNIX and Windows (/dev/null vs nul) > > +use File::Spec; > > + > > +my $NULL = File::Spec->devnull(); > > + > > # Highlight by reversing foreground and background. You could do > > # other things like bold or underline if you prefer. > > my @OLD_HIGHLIGHT = ( > > @@ -134,7 +139,7 @@ sub highlight_stdin { > > # fallback, which means we will work even if git can't be run. > > sub color_config { > > my ($key, $default) = @_; > > - my $s = `git config --get-color $key 2>/dev/null`; > > + my $s = `git config --get-color $key 2>$NULL`; > > return length($s) ? $s : $default; > > } > ``` ## Chris. Webster via GitGitGadget, 2018-10-31 22:58 Subject: [PATCH v2 0/1] DiffHighlight.pm: Use correct /dev/null for UNIX and Windows Message-ID: URL: https://gitlist.dev/e/pull.59.v2.git.gitgitgadget%40gmail.com In-Reply-To: ``` Use File::Spec->devnull() for output redirection to avoid messages when Windows version of Perl is first in path. The message 'The system cannot find the path specified.' is displayed each time git is run to get colors. Chris. Webster (1): diff-highlight: Use correct /dev/null for UNIX and Windows contrib/diff-highlight/DiffHighlight.pm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) base-commit: c670b1f876521c9f7cd40184bf7ed05aad843433 Published-As: https://github.com/gitgitgadget/git/releases/tags/pr-59%2Fwebstech%2Fmaster-v2 Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-59/webstech/master-v2 Pull-Request: https://github.com/gitgitgadget/git/pull/59 Range-diff vs v1: 1: 8159cbd1b8 ! 1: bcbffa1411 Use correct /dev/null for UNIX and Windows @@ -1,6 +1,6 @@ -Author: chris +Author: Chris. Webster - Use correct /dev/null for UNIX and Windows + diff-highlight: Use correct /dev/null for UNIX and Windows Use File::Spec->devnull() for output redirection to avoid messages when Windows version of Perl is first in path. The message 'The -- gitgitgadget ``` ## Junio C Hamano, 2018-11-01 01:57 Subject: Re: [PATCH 1/1] Use correct /dev/null for UNIX and Windows Message-ID: URL: https://gitlist.dev/e/xmqqftwlv9td.fsf%40gitster-ct.c.googlers.com In-Reply-To: ``` Johannes Schindelin writes: > Indeed, the patch in question regards something I consider outside Git for > Windows' realm. As Chris said, you can run this script from a PowerShell > prompt, without any Git Bash (and without Git's Perl) involved. > > I am fine with this patch, as long as the author name is fixed to match > the name in the Signed-off-by: footer ;-) [*1*] Thanks, I'll find a corrected patch on the list (or manufacture it out of the original) and queue, then. ``` ## Johannes Schindelin, 2018-11-06 14:01 Subject: Re: [PATCH v2 1/1] diff-highlight: Use correct /dev/null for UNIX and Windows Message-ID: URL: https://gitlist.dev/e/nycvar.QRO.7.76.6.1811061501210.86%40tvgsbejvaqbjf.bet In-Reply-To: ``` List, I have no idea why this mail made it to GitGitGadget's email account but not to the Git mailing list... Sorry about that. Ciao, Johannes On Wed, 31 Oct 2018, Chris. Webster via GitGitGadget wrote: > From: "Chris. Webster" > > Use File::Spec->devnull() for output redirection to avoid messages > when Windows version of Perl is first in path. The message 'The > system cannot find the path specified.' is displayed each time git is > run to get colors. > > Signed-off-by: Chris. Webster > --- > contrib/diff-highlight/DiffHighlight.pm | 7 ++++++- > 1 file changed, 6 insertions(+), 1 deletion(-) > > diff --git a/contrib/diff-highlight/DiffHighlight.pm b/contrib/diff-highlight/DiffHighlight.pm > index 536754583b..7440aa1c46 100644 > --- a/contrib/diff-highlight/DiffHighlight.pm > +++ b/contrib/diff-highlight/DiffHighlight.pm > @@ -4,6 +4,11 @@ use 5.008; > use warnings FATAL => 'all'; > use strict; > > +# Use the correct value for both UNIX and Windows (/dev/null vs nul) > +use File::Spec; > + > +my $NULL = File::Spec->devnull(); > + > # Highlight by reversing foreground and background. You could do > # other things like bold or underline if you prefer. > my @OLD_HIGHLIGHT = ( > @@ -134,7 +139,7 @@ sub highlight_stdin { > # fallback, which means we will work even if git can't be run. > sub color_config { > my ($key, $default) = @_; > - my $s = `git config --get-color $key 2>/dev/null`; > + my $s = `git config --get-color $key 2>$NULL`; > return length($s) ? $s : $default; > } > > -- > gitgitgadget > ``` ## Chris Webster, 2019-05-07 04:18 Subject: Re: [PATCH v2 1/1] diff-highlight: Use correct /dev/null for UNIX and Windows Message-ID: URL: https://gitlist.dev/e/CAGT1KpVn536%2BB6-8%3DopNAVnz3_w13Kx3LyED0Gbk%2B4DtwmoP6Q%40mail.gmail.com In-Reply-To: ``` I know these can take some time but is this pending any update from me? The accepted changes will be merged back into the diff-so-fancy project. There was a question about other uses of /dev/null. In the contrib directory, there are a couple of uses. contrib/buildsystems/engine.pl - not clear if this is still of use or always expects to always be running in a mingw type environment. contrib/mw-to-git/git-remote-mediawiki.perl - this is cloned from a separately maintained github project. Should any changes be issues on that project? thanks, ...chris. On Tue, Nov 6, 2018 at 6:02 AM Johannes Schindelin wrote: > > List, > > I have no idea why this mail made it to GitGitGadget's email account but > not to the Git mailing list... Sorry about that. > > Ciao, > Johannes > > On Wed, 31 Oct 2018, Chris. Webster via GitGitGadget wrote: > > > From: "Chris. Webster" > > > > Use File::Spec->devnull() for output redirection to avoid messages > > when Windows version of Perl is first in path. The message 'The > > system cannot find the path specified.' is displayed each time git is > > run to get colors. > > > > Signed-off-by: Chris. Webster > > --- > > contrib/diff-highlight/DiffHighlight.pm | 7 ++++++- > > 1 file changed, 6 insertions(+), 1 deletion(-) > > > > diff --git a/contrib/diff-highlight/DiffHighlight.pm b/contrib/diff-highlight/DiffHighlight.pm > > index 536754583b..7440aa1c46 100644 > > --- a/contrib/diff-highlight/DiffHighlight.pm > > +++ b/contrib/diff-highlight/DiffHighlight.pm > > @@ -4,6 +4,11 @@ use 5.008; > > use warnings FATAL => 'all'; > > use strict; > > > > +# Use the correct value for both UNIX and Windows (/dev/null vs nul) > > +use File::Spec; > > + > > +my $NULL = File::Spec->devnull(); > > + > > # Highlight by reversing foreground and background. You could do > > # other things like bold or underline if you prefer. > > my @OLD_HIGHLIGHT = ( > > @@ -134,7 +139,7 @@ sub highlight_stdin { > > # fallback, which means we will work even if git can't be run. > > sub color_config { > > my ($key, $default) = @_; > > - my $s = `git config --get-color $key 2>/dev/null`; > > + my $s = `git config --get-color $key 2>$NULL`; > > return length($s) ? $s : $default; > > } > > > > -- > > gitgitgadget > > ``` ## Git Gadget, 2019-05-08 10:45 Subject: Fwd: [PATCH v2 1/1] diff-highlight: Use correct /dev/null for UNIX and Windows Message-ID: URL: https://gitlist.dev/e/CANg4QoEPWcnPpbUYcgR4PmECzjCOmroAmH2fMoX-vhw%2BW_dVnQ%40mail.gmail.com In-Reply-To: ``` Forwarding this mail to the Git mailing list, as the original did not make it there (for reasons unknown). ---------- Forwarded message --------- From: Chris. Webster via GitGitGadget Date: Wed, Oct 31, 2018 at 11:58 PM Subject: [PATCH v2 1/1] diff-highlight: Use correct /dev/null for UNIX and Windows To: Cc: Junio C Hamano , Chris. Webster From: "Chris. Webster" Use File::Spec->devnull() for output redirection to avoid messages when Windows version of Perl is first in path. The message 'The system cannot find the path specified.' is displayed each time git is run to get colors. Signed-off-by: Chris. Webster --- contrib/diff-highlight/DiffHighlight.pm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/contrib/diff-highlight/DiffHighlight.pm b/contrib/diff-highlight/DiffHighlight.pm index 536754583b..7440aa1c46 100644 --- a/contrib/diff-highlight/DiffHighlight.pm +++ b/contrib/diff-highlight/DiffHighlight.pm @@ -4,6 +4,11 @@ use 5.008; use warnings FATAL => 'all'; use strict; +# Use the correct value for both UNIX and Windows (/dev/null vs nul) +use File::Spec; + +my $NULL = File::Spec->devnull(); + # Highlight by reversing foreground and background. You could do # other things like bold or underline if you prefer. my @OLD_HIGHLIGHT = ( @@ -134,7 +139,7 @@ sub highlight_stdin { # fallback, which means we will work even if git can't be run. sub color_config { my ($key, $default) = @_; - my $s = `git config --get-color $key 2>/dev/null`; + my $s = `git config --get-color $key 2>$NULL`; return length($s) ? $s : $default; } -- gitgitgadget ``` ## Junio C Hamano, 2019-05-09 03:19 Subject: Re: Fwd: [PATCH v2 1/1] diff-highlight: Use correct /dev/null for UNIX and Windows Message-ID: URL: https://gitlist.dev/e/xmqqh8a4fh68.fsf%40gitster-ct.c.googlers.com In-Reply-To: ``` Git Gadget writes: > Forwarding this mail to the Git mailing list, as the original did not > make it there (for reasons unknown). It seems that the forwarding mechansim (if this weren't manual---I cannot tell) mangles whitespaces? No need to resend, as the receiving end manually fixed them up. Thanks. > > ---------- Forwarded message --------- > From: Chris. Webster via GitGitGadget > Date: Wed, Oct 31, 2018 at 11:58 PM > Subject: [PATCH v2 1/1] diff-highlight: Use correct /dev/null for UNIX > and Windows > To: > Cc: Junio C Hamano , Chris. Webster > > > From: "Chris. Webster" > > Use File::Spec->devnull() for output redirection to avoid messages > when Windows version of Perl is first in path. The message 'The > system cannot find the path specified.' is displayed each time git is > run to get colors. > > Signed-off-by: Chris. Webster > --- > contrib/diff-highlight/DiffHighlight.pm | 7 ++++++- > 1 file changed, 6 insertions(+), 1 deletion(-) > > diff --git a/contrib/diff-highlight/DiffHighlight.pm > b/contrib/diff-highlight/DiffHighlight.pm > index 536754583b..7440aa1c46 100644 > --- a/contrib/diff-highlight/DiffHighlight.pm > +++ b/contrib/diff-highlight/DiffHighlight.pm > @@ -4,6 +4,11 @@ use 5.008; > use warnings FATAL => 'all'; > use strict; > > +# Use the correct value for both UNIX and Windows (/dev/null vs nul) > +use File::Spec; > + > +my $NULL = File::Spec->devnull(); > + > # Highlight by reversing foreground and background. You could do > # other things like bold or underline if you prefer. > my @OLD_HIGHLIGHT = ( > @@ -134,7 +139,7 @@ sub highlight_stdin { > # fallback, which means we will work even if git can't be run. > sub color_config { > my ($key, $default) = @_; > - my $s = `git config --get-color $key 2>/dev/null`; > + my $s = `git config --get-color $key 2>$NULL`; > return length($s) ? $s : $default; > } > > -- > gitgitgadget ``` ## Johannes Schindelin, 2019-05-09 18:52 Subject: Re: Fwd: [PATCH v2 1/1] diff-highlight: Use correct /dev/null for UNIX and Windows Message-ID: URL: https://gitlist.dev/e/nycvar.QRO.7.76.6.1905092048130.44%40tvgsbejvaqbjf.bet In-Reply-To: ``` Hi Junio, On Thu, 9 May 2019, Junio C Hamano wrote: > Git Gadget writes: > > > Forwarding this mail to the Git mailing list, as the original did not > > make it there (for reasons unknown). > > It seems that the forwarding mechansim (if this weren't manual---I > cannot tell) mangles whitespaces? No need to resend, as the > receiving end manually fixed them up. I did send it manually, via the GMail interface (which I seem to be unable to use effectively). Sorry for the trouble, and thanks for fixing it up. For the record, you could also always just fetch from the tag. The mails GitGitGadget sends (unless I manually forward mails) are generated from those tags, so (modulo bugs) the sent patch and the commit(s) reachable from the published tag are identical. In this instance, it would have been: git fetch https://github.com/gitgitgadget/git \ pr-59/webstech/master-v2 Thank you, Dscho ``` ## Philip Oakley, 2019-05-12 20:24 Subject: Re: [PATCH v2 1/1] diff-highlight: Use correct /dev/null for UNIX and Windows Message-ID: URL: https://gitlist.dev/e/d8bd7df9-ec1a-3012-488e-1986dee9c9a5%40iee.org In-Reply-To: ``` Hi Chris, On 07/05/2019 05:18, Chris Webster wrote: > I know these can take some time but is this pending any update from > me? The accepted changes will be merged back into the diff-so-fancy > project. > > There was a question about other uses of /dev/null. In the contrib > directory, there are a couple of uses. > > contrib/buildsystems/engine.pl - not clear if this is still of use or > always expects to always be running in a mingw type environment. While the `contrib/buildsystems/engine.pl ` is not often used, it does provide a route for users of older Visual studio version. I'm not sure if the mingw environment is relevant to its operation - I'd expect it (the generation of an .sln that would compile) to still work with the current MSYS2 basis, but the `install` process was never fully completed (an probably isn't a worthwhile project unless you have the particular itch to scratch). The newer MSVC=1 build process using vcpkg has solved most of the issues, but I'm getting a couple of issues with some of the libraries/include paths with the latest VS2017, see issue #2186 / #2179 / https://groups.google.com/forum/#!topic/git-for-windows/Y99a0dzlVJY , though hopefully I'll get them sorted this week. > contrib/mw-to-git/git-remote-mediawiki.perl - this is cloned from a > separately maintained github project. Should any changes be issues on > that project? > > thanks, > ...chris. > > On Tue, Nov 6, 2018 at 6:02 AM Johannes Schindelin > wrote: >> List, >> >> I have no idea why this mail made it to GitGitGadget's email account but >> not to the Git mailing list... Sorry about that. >> >> Ciao, >> Johannes >> >> On Wed, 31 Oct 2018, Chris. Webster via GitGitGadget wrote: >> >>> From: "Chris. Webster" >>> >>> Use File::Spec->devnull() for output redirection to avoid messages >>> when Windows version of Perl is first in path. The message 'The >>> system cannot find the path specified.' is displayed each time git is >>> run to get colors. >>> >>> Signed-off-by: Chris. Webster >>> --- >>> contrib/diff-highlight/DiffHighlight.pm | 7 ++++++- >>> 1 file changed, 6 insertions(+), 1 deletion(-) >>> >>> diff --git a/contrib/diff-highlight/DiffHighlight.pm b/contrib/diff-highlight/DiffHighlight.pm >>> index 536754583b..7440aa1c46 100644 >>> --- a/contrib/diff-highlight/DiffHighlight.pm >>> +++ b/contrib/diff-highlight/DiffHighlight.pm >>> @@ -4,6 +4,11 @@ use 5.008; >>> use warnings FATAL => 'all'; >>> use strict; >>> >>> +# Use the correct value for both UNIX and Windows (/dev/null vs nul) >>> +use File::Spec; >>> + >>> +my $NULL = File::Spec->devnull(); >>> + >>> # Highlight by reversing foreground and background. You could do >>> # other things like bold or underline if you prefer. >>> my @OLD_HIGHLIGHT = ( >>> @@ -134,7 +139,7 @@ sub highlight_stdin { >>> # fallback, which means we will work even if git can't be run. >>> sub color_config { >>> my ($key, $default) = @_; >>> - my $s = `git config --get-color $key 2>/dev/null`; >>> + my $s = `git config --get-color $key 2>$NULL`; >>> return length($s) ? $s : $default; >>> } >>> >>> -- >>> gitgitgadget >>> ```