]> Sergey Matveev's repositories - public-inbox.git/commitdiff
searchidx: don't assume "a/" and "b/" as prefixes
authorEric Wong <e@yhbt.net>
Sat, 25 Jan 2020 04:45:06 +0000 (04:45 +0000)
committerEric Wong <e@yhbt.net>
Mon, 27 Jan 2020 02:59:09 +0000 (02:59 +0000)
Some people use "--{src,dst}-prefix=", try to deal with those
since git-apply can handle them when called by solver.

lib/PublicInbox/SearchIdx.pm

index f03e290eb7eb60becb62d32fddfaa5f7e9672579..3a066c39ea91e9baa93e7f5504e4499e6b5332d6 100644 (file)
@@ -220,12 +220,12 @@ sub index_diff ($$$) {
                        next unless $opt =~ /[uU]/;
                        $in_diff = index_old_diff_fn($self, \%seen, $fa, $fb,
                                                        $xnq);
-               } elsif (m!^--- ("?a/.+)!) {
+               } elsif (m!^--- ("?[^/]+/.+)!) {
                        my $fn = $1;
                        $fn = (split('/', git_unquote($fn), 2))[1];
                        $seen{$fn}++ or index_diff_inc($self, $fn, 'XDFN', $xnq);
                        $in_diff = 1;
-               } elsif (m!^\+\+\+ ("?b/.+)!)  {
+               } elsif (m!^\+\+\+ ("?[^/]+/.+)!)  {
                        my $fn = $1;
                        $fn = (split('/', git_unquote($fn), 2))[1];
                        $seen{$fn}++ or index_diff_inc($self, $fn, 'XDFN', $xnq);