about summary refs log tree commit homepage
diff options
context:
space:
mode:
authorEric Wong <e@80x24.org>2020-01-02 09:24:57 +0000
committerEric Wong <e@80x24.org>2020-01-03 02:29:15 +0000
commit3eafdb33697581b8d797bf7c664a53a311725075 (patch)
tree742d905ee1313b54b801ed50fae2f92c48f4d8c8
parent7a6e1292928865be110e66020932eba4522b2bf6 (diff)
downloadpublic-inbox-3eafdb33697581b8d797bf7c664a53a311725075.tar.gz
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.
-rw-r--r--lib/PublicInbox/SolverGit.pm1
1 files changed, 1 insertions, 0 deletions
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);
                 }