solvergit: deal with alternative diff prefixes

At least, without extra directory levels, since
git-diff supports --src-prefix and --dst-prefix,
and /git/6aa8857a11/s/ uses it...

diff --git a/lib/PublicInbox/SolverGit.pm b/lib/PublicInbox/SolverGit.pm
index d9b312c18d2f155ae39c417f60830395c58e3e9e..d7875333af9cec3dcc4f5df20aeda4e185a3a316 100644 (file)
--- a/lib/PublicInbox/SolverGit.pm
+++ b/lib/PublicInbox/SolverGit.pm
@@ -131,7 +131,7 @@ sub extract_diff ($$$$$) {
                        # 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);