Jeff King <peff@xxxxxxxx> writes: > The warning is generated deep in the diffcore code, which > means that it will come first, followed possibly by a spew > of conflicts, making it hard to see. > > Instead, let's have diffcore pass back the information about > how big the rename limit would needed to have been, and then > the caller can provide a more appropriate message (and at a > more appropriate time). > > No refactoring of other non-merge callers is necessary, > because nobody else was even using the warn_on_rename_limit > feature. > > Signed-off-by: Jeff King <peff@xxxxxxxx> Thanks. This conflicts with 2840824 (diffcore-rename: fall back to -C when -C -C busts the rename limit, 2011-01-06) on 'pu', unfortunately. -- 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