X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FSolverGit.pm;h=eea59b6ddbda047496fe4917517fe4b3c6c53bdb;hb=48d4fdb2acbf8cf05dcb357df53b0d658f88fe39;hp=b7327ffa99a7543b7dff77b8c71ca27299712a49;hpb=3f4a8611c37294a1938ae5ac644c24290d1d14ae;p=public-inbox.git diff --git a/lib/PublicInbox/SolverGit.pm b/lib/PublicInbox/SolverGit.pm index b7327ffa..eea59b6d 100644 --- 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"