This is a resend of v2:
http://thread.gmane.org/gmane.comp.version-control.git/273117
plus 5 new changes. I have a few more real-fix changes that build
on top, but they are not sufficiently polished to be published yet
compared to these early clean-up bits.
Junio C Hamano (18):
rerere: fix an off-by-one non-bug
rerere: plug conflict ID leaks
rerere: lift PATH_MAX limitation
rerere: write out each record of MERGE_RR in one go
rerere: report autoupdated paths only after actually updating them
rerere: drop want_sp parameter from is_cmarker()
rerere: stop looping unnecessarily
rerere: explain the rerere I/O abstraction
rerere: explain MERGE_RR management helpers
rerere: explain the primary codepath
rerere: explain "rerere forget" codepath
rerere: explain the remainder
rerere: refactor "replay" part of do_plain_rerere()
rerere: further de-dent do_plain_rerere()
rerere: further clarify do_rerere_one_path()
rerere: call conflict-ids IDs
rerere: use "struct rerere_id" instead of "char *" for conflict ID
rerere: un-nest merge() further
builtin/rerere.c | 4 +-
rerere.c | 544 ++++++++++++++++++++++++++++++++++++++++---------------
rerere.h | 12 +-
3 files changed, 407 insertions(+), 153 deletions(-)
--
2.5.0-rc2-340-g0cccc16
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
