Git Gadget <[email protected]> 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 <[email protected]> > 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: <[email protected]> > Cc: Junio C Hamano <[email protected]>, Chris. Webster <[email protected]> > > > From: "Chris. Webster" <[email protected]> > > 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 <[email protected]> > --- > 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
