> >> Also, this will conflict with sb/object-store-lookup, won't it? I'm > >> guessing this is why you didn't touch the "git commit-graph > >> [write|verify]"code paths. > > It will conflict because of the change to lookup_commit(), but the only > > new code I'm writing is in t/helper/test-repository.c, so hopefully the > > merge won't be too tedious. The main reason why I didn't touch the > > writing/verifying part is to reduce the size of this patch set, and > > because that change is not needed to update parse_commit() and others. > > I guess my main complaint is that this won't be an actual "merge" > conflict, but the result will not compile. Since Stefan already has a > series out that changes this method, I recommend basing your series on > it (in addition to basing it on ds/commit-graph-fsck).
Good point. Junio requested a reroll in his What's Cooking e-mail [1], and the same e-mail states that ds/commit-graph-fsck and sb/object-store-lookup will be merged to next, so there are a few good reasons to base it on both. I'll do that and send out an updated version soon. [1] https://public-inbox.org/git/xmqq7em138a5....@gitster-ct.c.googlers.com/
