On 06/05, Thomas Gummerer wrote: > The previous round was at > <20180520211210.1248-1-t.gummerer@xxxxxxxxx>. > > Thanks Junio for the comments on the previous round. > > Changes since v2: > - lowercase the first letter in some error/warning messages before > marking them for translation > - wrap paths in output in single quotes, for consistency, and to make > some of the messages the same as ones that are already translated > - mark messages in builtin/rerere.c for translation as well, which I > had previously forgotten. > - expanded the technical documentation on rerere. The entire > document is basically rewritten. > - changed the test in 6/10 to just fake a conflict marker inside of > one of the hunks instead of using an inner conflict created by a > merge. This is to make sure the codepath is still hit after we > handle inner conflicts properly. > - added tests for handling inner conflict markers > - added one commit to recalculate the conflict ID when an unresolved > conflict is committed, and the subsequent operation conflicts again > in the same file. More explanation in the commit message of that > commit. Now that 2.18 is out (and I'm caught up on the list after being away from it for a few days), is there any interest in this series? I guess it was overlooked as it's been sent in the rc phase for 2.18. I think the most important bit here is 6/10 which fixes a crash that can happen in "normal" usage of git. The translation bits are also nice to have I think, but I could send them in a different series if that's preferred. The other patches would be nice to have, but are arguably less important. > range-diff below. A few commits changed enough for range-diff > to give up showing the differences in those, they are probably best > reviewed as the whole patch anyway: > > [snip] > > Thomas Gummerer (10): > rerere: unify error messages when read_cache fails > rerere: lowercase error messages > rerere: wrap paths in output in sq > rerere: mark strings for translation > rerere: add some documentation > rerere: fix crash when conflict goes unresolved > rerere: only return whether a path has conflicts or not > rerere: factor out handle_conflict function > rerere: teach rerere to handle nested conflicts > rerere: recalculate conflict ID when unresolved conflict is committed > > Documentation/technical/rerere.txt | 182 +++++++++++++++++++++ > builtin/rerere.c | 4 +- > rerere.c | 246 ++++++++++++++--------------- > t/t4200-rerere.sh | 67 ++++++++ > 4 files changed, 372 insertions(+), 127 deletions(-) > create mode 100644 Documentation/technical/rerere.txt > > -- > 2.18.0.rc1.242.g61856ae69 >
