solvergit: use --unidiff-zero with git-apply(1)

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

diff --git a/lib/PublicInbox/SolverGit.pm b/lib/PublicInbox/SolverGit.pm
index b7327ffa99a7543b7dff77b8c71ca27299712a49..95334d7a8eeb4364738c4482ed457ec0dc27461d 100644 (file)
--- a/lib/PublicInbox/SolverGit.pm
+++ b/lib/PublicInbox/SolverGit.pm
@@ -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"