check for File::Temp 0.19 for ->newdir method

[public-inbox.git] / lib / PublicInbox / SolverGit.pm

diff --git a/lib/PublicInbox/SolverGit.pm b/lib/PublicInbox/SolverGit.pm
index b7327ffa99a7543b7dff77b8c71ca27299712a49..eea59b6ddbda047496fe4917517fe4b3c6c53bdb 100644 (file)
--- a/lib/PublicInbox/SolverGit.pm
+++ b/lib/PublicInbox/SolverGit.pm
@@ -10,7 +10,7 @@
 package PublicInbox::SolverGit;
 use strict;
 use warnings;
-use File::Temp qw();
+use File::Temp 0.19 ();
 use Fcntl qw(SEEK_SET);
 use PublicInbox::Git qw(git_unquote git_quote);
 use PublicInbox::MsgIter qw(msg_iter msg_part_text);
@@ -450,7 +450,7 @@ sub do_git_apply ($) {
 
        # we need --ignore-whitespace because some patches are CRLF
        my @cmd = (qw(git -C), $dn, qw(apply --cached --ignore-whitespace
-                       --whitespace=warn --verbose));
+                       --unidiff-zero --whitespace=warn --verbose));
        my $len = length(join(' ', @cmd));
        my $total = $self->{tot};
        my $di; # keep track of the last one for "git ls-files"