On Sat, Aug 24, 2013 at 11:07 AM, Duy Nguyen <pclouds@xxxxxxxxx> wrote: > On Mon, Aug 19, 2013 at 2:42 AM, Thomas Gummerer <t.gummerer@xxxxxxxxx> wrote: >> Write the index version 5 file format to disk. This version doesn't >> write the cache-tree data and resolve-undo data to the file. > > I keep having things to add after sending my emails. Now that we have > all conflicted entries in file block, the conflict data block becomes > optional, it functions exactly (I think) like resolve-undo extension, > which makes me think it might make sense to make conflict data block > an extension. > > If we make it so, we might want to move "cr" and "ncr" fields out of > direntries. I don't see a solution yet, but I think it's interesting > because future extensions might want to attach stuff to direntries, > just like "cr"/"ncr" from conflict extension. We may want to think now > how that might be done (and conflict extension is a good exercise to > see how it works out) And the solution is pretty obvious: keep resolve-undo extension as _extension_ just like in v2 (and no "cr/ncr" in direntries). The only difference is the time resolve-undo extension is updated: in v2, new entries are added at remove_index_entry_at(), in v5 new entries are added when new stage entries are detected at write_index(). -- Duy -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html