solver: try the next patch on apply failures

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.

diff --git a/lib/PublicInbox/SolverGit.pm b/lib/PublicInbox/SolverGit.pm
index c57fb4c6b5c5e60f35a4004864b185512c2eb21d..3e3a5899f25523ca58605d5710207dcb5cfa1c1f 100644 (file)
--- 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);
                }