Re: [PATCH 1/1] Use correct /dev/null for UNIX and Windows
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Oct 31, 2018, 04:54 UTC
- Message-ID
- <xmqqsh0mwwah.fsf@gitster-ct.c.googlers.com>
- In-Reply-To
- <8159cbd1b8025f33fb9d0e254db1a3c2a066f853.1540923993.git.gitgitgadget@gmail.com>
"chris via GitGitGadget" <gitgitgadget@gmail.com> writes:
> From: chris <chris@webstech.net> > > 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.
Show 32 quoted lines
> system cannot find the path specified.' is displayed each time git is
> run to get colors.
>
> Signed-off-by: Chris. Webster <chris@webstech.net>
> ---
> 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;
> }