lib/PublicInbox/SolverGit.pm | 7 +++---- diff --git a/lib/PublicInbox/SolverGit.pm b/lib/PublicInbox/SolverGit.pm index 24d9da2f42b14ff8a89344321dba2e5daa1c7d00..891cde2087dbf55f6e6f738752c105f4dd94e027 100644 --- a/lib/PublicInbox/SolverGit.pm +++ b/lib/PublicInbox/SolverGit.pm @@ -389,8 +389,8 @@ my $dn = $self->{tmp}->dirname; my $patches = $self->{patches}; # we need --ignore-whitespace because some patches are CRLF - my @cmd = qw(git apply --cached --ignore-whitespace - --whitespace=warn --verbose); + my @cmd = (qw(git -C), $dn, qw(apply --cached --ignore-whitespace + --whitespace=warn --verbose)); my $len = length(join(' ', @cmd)); my $total = $self->{tot}; my $di; # keep track of the last one for "git ls-files" @@ -400,8 +400,7 @@ my $i = ++$self->{nr}; $di = shift @$patches; dbg($self, "\napplying [$i/$total] " . di_url($self, $di) . "\n" . join('', @{$di->{hdr_lines}})); - my $pn = $total + 1 - $i; - my $path = "$dn/$pn"; + my $path = $total + 1 - $i; $len += length($path) + 1; push @cmd, $path; } while (@$patches && $len < $ARG_SIZE_MAX);