diff options
author | Eric Wong <e@yhbt.net> | 2020-01-25 04:45:06 +0000 |
---|---|---|
committer | Eric Wong <e@yhbt.net> | 2020-01-27 02:59:09 +0000 |
commit | 180f66ec873a6715a66b521e05fa9f9a976f3b03 (patch) | |
tree | 48bfa80bd32b86518b0a5ff315e57a11fec15f45 /lib/PublicInbox | |
parent | 9aa510cd3c4563b375ca4fc9a821db832ab88081 (diff) | |
download | public-inbox-180f66ec873a6715a66b521e05fa9f9a976f3b03.tar.gz |
Some people use "--{src,dst}-prefix=", try to deal with those since git-apply can handle them when called by solver.
Diffstat (limited to 'lib/PublicInbox')
-rw-r--r-- | lib/PublicInbox/SearchIdx.pm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/PublicInbox/SearchIdx.pm b/lib/PublicInbox/SearchIdx.pm index f03e290e..3a066c39 100644 --- a/lib/PublicInbox/SearchIdx.pm +++ b/lib/PublicInbox/SearchIdx.pm @@ -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); |