diff options
| author |  Jiang Xin <worldhello.net@gmail.com> | 2019-05-31 14:34:26 +0800 |
|---|---|---|
| committer | Jiang Xin <worldhello.net@gmail.com> | 2019-05-31 14:34:26 +0800 |
| commit | a17177ce3ac74afc0b2e6fc6c80c1e1991b96a13 (patch) | |
| tree | 0ff1a62d28a13bc8d8708148b85d3b0ba2632f92 /contrib/diff-highlight/DiffHighlight.pm | |
| parent | Merge branch 'master' of https://github.com/Softcatala/git-po (diff) | |
| parent | Git 2.22-rc2 (diff) | |
| download | tgif-a17177ce3ac74afc0b2e6fc6c80c1e1991b96a13.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/git/git
* 'master' of git://git.kernel.org/pub/scm/git/git: (66 commits)
Git 2.22-rc2
...
Diffstat (limited to 'contrib/diff-highlight/DiffHighlight.pm')
| -rw-r--r-- | contrib/diff-highlight/DiffHighlight.pm | 7 |
1 files changed, 6 insertions, 1 deletions
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; } |