Junio C Hamano <gits...@pobox.com> writes: > Junio C Hamano <gits...@pobox.com> writes: > >> Brandon Williams <bmw...@google.com> writes: >> >>> A month or so ago I thought I would lend a hand to Brian and do a round of >>> conversions from sha1 -> struct object_id. Now that Brian's latest series >>> has >>> hit master I can finally send these patches out. >>> >>> The first couple patches are from Brian which convert some of the notes >>> logic >>> to using 'struct object_id'. The remaining patches are to convert the grep >>> and >>> diff machinery to using 'struct object_id'. >> >> Nicely done for all of them. Thanks. Will queue (with tweaks >> mentioned in the comments). > > Oops. I won't be able to queue this for now as it heavily conflicts > with blame-lib topic. The resolution should be trivial, mechanical > and boring, but takes time that I do not have today.
I lied. This also conflicts somewhat with Peff's diff-blob topic. I think I resolved them correctly (there needs evil merges applied to two files when merging this topic), and hopefully can push out the result by the end of the day. Thanks.
