solvergit: deal with alternative diff prefixes

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

diff --git a/lib/PublicInbox/SolverGit.pm b/lib/PublicInbox/SolverGit.pm
index 24d9da2f42b14ff8a89344321dba2e5daa1c7d00..d7875333af9cec3dcc4f5df20aeda4e185a3a316 100644 (file)
--- a/lib/PublicInbox/SolverGit.pm
+++ b/lib/PublicInbox/SolverGit.pm
@@ -125,12 +125,13 @@ sub extract_diff ($$$$$) {
 
                        push @$hdr_lines, $l;
                        $di->{hdr_lines} = $hdr_lines;
+                       utf8::encode($_) for @$hdr_lines;
                        print $tmp @$hdr_lines or die "print(tmp): $!";
 
                        # for debugging/diagnostics:
                        $di->{ibx} = $ibx;
                        $di->{smsg} = $smsg;
-               } elsif ($l =~ m!\Adiff --git ("?a/.+) ("?b/.+)$!) {
+               } elsif ($l =~ m!\Adiff --git ("?[^/]+/.+) ("?[^/]+/.+)$!) {
                        last if $tmp; # got our blob, done!
 
                        my ($path_a, $path_b) = ($1, $2);
@@ -153,6 +154,7 @@ sub extract_diff ($$$$$) {
                        $di->{path_b} = join('/', @b);
                        $hdr_lines = [ $l ];
                } elsif ($tmp) {
+                       utf8::encode($l);
                        print $tmp $l or die "print(tmp): $!";
                } elsif ($hdr_lines) {
                        push @$hdr_lines, $l;
@@ -284,7 +286,8 @@ EOF
 
 sub extract_old_mode ($) {
        my ($di) = @_;
-       if (grep(/\Aold mode (100644|100755|120000)$/, @{$di->{hdr_lines}})) {
+       if (join('', @{$di->{hdr_lines}}) =~
+                       /^old mode (100644|100755|120000)\b/) {
                return $1;
        }
        '100644';
@@ -389,8 +392,8 @@ sub do_git_apply ($) {
        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 +403,7 @@ sub do_git_apply ($) {
                $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);