From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 1/3] solver: try the next patch on apply failures
Date: Thu, 2 Jan 2020 09:24:57 +0000 [thread overview]
Message-ID: <20200102092459.17612-2-e@80x24.org> (raw)
In-Reply-To: <20200102092459.17612-1-e@80x24.org>
Sometimes a patch is corrupted and resent to create the same
OID. We need to account for that case and actually move onto
the next patch instead of blindly trying "git ls-files" to get
nothing out of it.
---
lib/PublicInbox/SolverGit.pm | 1 +
1 file changed, 1 insertion(+)
diff --git a/lib/PublicInbox/SolverGit.pm b/lib/PublicInbox/SolverGit.pm
index c57fb4c6..3e3a5899 100644
--- a/lib/PublicInbox/SolverGit.pm
+++ b/lib/PublicInbox/SolverGit.pm
@@ -452,6 +452,7 @@ sub apply_result ($$) {
if ($nxt && oids_same_ish($nxt->{oid_b}, $di->{oid_b})) {
dbg($self, $msg);
dbg($self, 'trying '.di_url($self, $nxt));
+ return do_git_apply($self);
} else {
ERR($self, $msg);
}
next prev parent reply other threads:[~2020-01-02 9:24 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-02 9:24 [PATCH 0/3] solver bugfixes and tweaks Eric Wong
2020-01-02 9:24 ` Eric Wong [this message]
2020-01-02 9:24 ` [PATCH 2/3] solver: extract_diff: deal with missing "diff --git" line Eric Wong
2020-01-02 9:36 ` Eric Wong
2020-01-02 19:04 ` Eric Wong
2020-01-02 21:12 ` Eric Wong
2020-01-03 0:43 ` Eric Wong
2020-01-02 9:24 ` [PATCH 3/3] qspawn: use per-call quiet flag for solver Eric Wong
Reply instructions:
You may reply publicly 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: http://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=20200102092459.17612-2-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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/public-inbox.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).