Merge branch 'tr/perl-keep-stderr-open' into maint

* tr/perl-keep-stderr-open:
  t9700: do not close STDERR
  perl: redirect stderr to /dev/null instead of closing

1 files changed, 3 insertions, 3 deletions

diff --git a/perl/Git.pm b/perl/Git.pm
index f207b47183..a69467feaa 100644
--- a/perl/Git.pm
+++ b/perl/Git.pm
@@ -1335,12 +1335,12 @@ sub _command_common_pipe {
 		if (not defined $pid) {
 			throw Error::Simple("open failed: $!");
 		} elsif ($pid == 0) {
-			if (defined $opts{STDERR}) {
-				close STDERR;
-			}
 			if ($opts{STDERR}) {
 				open (STDERR, '>&', $opts{STDERR})
 					or die "dup failed: $!";
+			} elsif (defined $opts{STDERR}) {
+				open (STDERR, '>', '/dev/null')
+					or die "opening /dev/null failed: $!";
 			}
 			_cmd_exec($self, $cmd, @args);
 		}