user/dev discussion of public-inbox itself
 help / color / Atom feed
From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 11/11] solvergit: deal with alternative diff prefixes
Date: Wed, 30 Jan 2019 04:44:30 +0000
Message-ID: <20190130044430.28189-12-e@80x24.org> (raw)
In-Reply-To: <20190130044430.28189-1-e@80x24.org>

At least, without extra directory levels, since
git-diff supports --src-prefix and --dst-prefix,
and /git/6aa8857a11/s/ uses it...
---
 lib/PublicInbox/SolverGit.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/PublicInbox/SolverGit.pm b/lib/PublicInbox/SolverGit.pm
index d9b312c..d787533 100644
--- 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);
-- 
EW


      parent reply index

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-01-30  4:44 [PATCH 00/11] viewvcs: more fixes Eric Wong
2019-01-30  4:44 ` [PATCH 01/11] hval: add src_escape for highlight post-processing Eric Wong
2019-01-30  4:44 ` [PATCH 02/11] t/check-www-inbox: replace IPC::Run with PublicInbox::Spawn Eric Wong
2019-01-30  4:44 ` [PATCH 03/11] t/check-www-inbox: don't follow mboxes Eric Wong
2019-01-30  4:44 ` [PATCH 04/11] t/check-www-inbox: disable history Eric Wong
2019-01-30  4:44 ` [PATCH 05/11] solvergit: do not solve blobs twice Eric Wong
2019-01-30  4:44 ` [PATCH 06/11] viewvcs: avoid segfault with highlight.pm at shutdown Eric Wong
2019-01-30  4:44 ` [PATCH 07/11] css/216dark: add comments and tweak highlight colors Eric Wong
2019-01-30  4:44 ` [PATCH 08/11] solvergit: do not show full path names to "git apply" Eric Wong
2019-01-30  4:44 ` [PATCH 09/11] solvergit: avoid "Wide character" warnings Eric Wong
2019-01-30  4:44 ` [PATCH 10/11] solvergit: extract mode from diff headers properly Eric Wong
2019-01-30  4:44 ` Eric Wong [this message]

Reply instructions:

You may reply publically to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://public-inbox.org/README

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190130044430.28189-12-e@80x24.org \
    --to=e@80x24.org \
    --cc=meta@public-inbox.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

user/dev discussion of public-inbox itself

Archives are clonable:
	git clone --mirror https://public-inbox.org/meta
	git clone --mirror http://czquwvybam4bgbro.onion/meta
	git clone --mirror http://hjrcffqmbrq6wope.onion/meta
	git clone --mirror http://ou63pmih66umazou.onion/meta

Newsgroups are available over NNTP:
	nntp://news.public-inbox.org/inbox.comp.mail.public-inbox.meta
	nntp://ou63pmih66umazou.onion/inbox.comp.mail.public-inbox.meta
	nntp://czquwvybam4bgbro.onion/inbox.comp.mail.public-inbox.meta
	nntp://hjrcffqmbrq6wope.onion/inbox.comp.mail.public-inbox.meta
	nntp://news.gmane.org/gmane.mail.public-inbox.general

 note: .onion URLs require Tor: https://www.torproject.org/

AGPL code for this site: git clone https://public-inbox.org/ public-inbox