From 2dd86683ec2f237538766d4d632de7cb2dd0f3e3 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Thu, 14 Nov 2019 01:03:38 +0000 Subject: solvergit: use --unidiff-zero with git-apply(1) I sometimes post context-free documentation patches generated with "-U0" to reduce size and bandwidth overhead when replacing URLs or updating copyright notices. git-apply(1) needs the --unidiff-zero switch to work properly with context-free patches. Given our search looks for blob OIDs, and we're never going to be running the code we regenerate, "--unidiff-zero" ought to be safe. --- lib/PublicInbox/SolverGit.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/PublicInbox/SolverGit.pm b/lib/PublicInbox/SolverGit.pm index b7327ffa..95334d7a 100644 --- 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" -- cgit v1.2.3-24-ge0c7