From: Junio C Hamano <gitster@pobox.com>
To: Johannes Schindelin <johannes.schindelin@gmx.de>
Cc: "chris via GitGitGadget" <gitgitgadget@gmail.com>,
git@vger.kernel.org, chris <chris@webstech.net>
Subject: Re: [PATCH 1/1] Use correct /dev/null for UNIX and Windows
Date: Wed, 31 Oct 2018 13:54:30 +0900 [thread overview]
Message-ID: <xmqqsh0mwwah.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <8159cbd1b8025f33fb9d0e254db1a3c2a066f853.1540923993.git.gitgitgadget@gmail.com> (chris via GitGitGadget's message of "Tue, 30 Oct 2018 11:26:36 -0700 (PDT)")
"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.
> 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;
> }
next prev parent reply other threads:[~2018-10-31 4:54 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-30 18:26 [PATCH 0/1] DiffHighlight.pm: Use correct /dev/null for UNIX and Windows Chris. Webster via GitGitGadget
2018-10-30 18:26 ` [PATCH 1/1] " chris via GitGitGadget
2018-10-31 3:56 ` Jeff King
2018-10-31 4:48 ` Junio C Hamano
2018-10-31 4:54 ` Junio C Hamano [this message]
[not found] ` <CAGT1KpWoGD0xgTrC-+X1WqY_M=2arYbs4ZX6Nnj-zHK6mgu+nw@mail.gmail.com>
2018-10-31 5:41 ` Chris Webster
2018-10-31 6:08 ` Junio C Hamano
2018-10-31 11:10 ` Johannes Schindelin
2018-11-01 1:57 ` Junio C Hamano
2018-10-31 5:07 ` Junio C Hamano
2018-10-31 11:14 ` Johannes Schindelin
2018-10-31 22:58 ` [PATCH v2 0/1] DiffHighlight.pm: " Chris. Webster via GitGitGadget
[not found] ` <bcbffa141116f869db40e4572f9824a3d090c20c.1541026721.git.gitgitgadget@gmail.com>
2018-11-06 14:01 ` [PATCH v2 1/1] diff-highlight: " Johannes Schindelin
2019-05-07 4:18 ` Chris Webster
2019-05-12 20:24 ` Philip Oakley
2019-05-08 10:45 ` Fwd: " Git Gadget
2019-05-09 3:19 ` Junio C Hamano
2019-05-09 18:52 ` Johannes Schindelin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqsh0mwwah.fsf@gitster-ct.c.googlers.com \
--to=gitster@pobox.com \
--cc=chris@webstech.net \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=johannes.schindelin@gmx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).