Merge branch 'ym/fix-opportunistic-index-update-race'

diff --git a/revision.c b/revision.c
index 794a8835c09142a170df40adf48d56500daae403..71e233742331a435edeadacc7c6a52226bb18b7a 100644 (file)
--- a/revision.c
+++ b/revision.c
@@ -2960,9 +2960,11 @@ static struct commit *get_revision_1(struct rev_info *revs)
                        if (revs->max_age != -1 &&
                            (commit->date < revs->max_age))
                                continue;
-                       if (add_parents_to_list(revs, commit, &revs->commits, NULL) < 0)
-                               die("Failed to traverse parents of commit %s",
-                                   sha1_to_hex(commit->object.sha1));
+                       if (add_parents_to_list(revs, commit, &revs->commits, NULL) < 0) {
+                               if (!revs->ignore_missing_links)
+                                       die("Failed to traverse parents of commit %s",
+                                               sha1_to_hex(commit->object.sha1));
+                       }
                }
 
                switch (simplify_commit(revs, commit)) {