* [PATCH 1/3] solver: try the next patch on apply failures
2020-01-02 9:24 5% [PATCH 0/3] solver bugfixes and tweaks Eric Wong
@ 2020-01-02 9:24 7% ` Eric Wong
0 siblings, 0 replies; 2+ results
From: Eric Wong @ 2020-01-02 9:24 UTC (permalink / raw)
To: meta
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);
}
^ permalink raw reply related [relevance 7%]
* [PATCH 0/3] solver bugfixes and tweaks
@ 2020-01-02 9:24 5% Eric Wong
2020-01-02 9:24 7% ` [PATCH 1/3] solver: try the next patch on apply failures Eric Wong
0 siblings, 1 reply; 2+ results
From: Eric Wong @ 2020-01-02 9:24 UTC (permalink / raw)
To: meta
A couple of improvements from errors I've seen with solver
and hopefully no regressions. [PATCH 2/3] is a bit scary :x
Eric Wong (3):
solver: try the next patch on apply failures
solver: extract_diff: deal with missing "diff --git" line
qspawn: use per-call quiet flag for solver
lib/PublicInbox/Qspawn.pm | 6 +-
lib/PublicInbox/SolverGit.pm | 168 ++++++++++++++++++-----------------
2 files changed, 89 insertions(+), 85 deletions(-)
^ permalink raw reply [relevance 5%]
Results 1-2 of 2 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2020-01-02 9:24 5% [PATCH 0/3] solver bugfixes and tweaks Eric Wong
2020-01-02 9:24 7% ` [PATCH 1/3] solver: try the next patch on apply failures Eric Wong
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).