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 891cde2087dbf55f6e6f738752c105f4dd94e027..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';