So, after my toy untested patch, here's a cleaner version. I splitted
it into really small patches, to avoid modifying code while I move it,
but Junio, feel free to squash 1/3 and 2/3 if you prefer.
This fixes a regression, so this should be in the next release if the
patch is OK.
Jim: can you confirm if it fixes your problem?
Matthieu Moy (3):
Move set_porcelain_error_msgs to unpack-trees.c and rename it
setup_unpack_trees_porcelain: take the whole options struct as
parameter
Move "show_all_errors = 1" to setup_unpack_trees_porcelain()
builtin/checkout.c | 3 +-
builtin/merge.c | 3 +-
merge-recursive.c | 46 +-----------------------------------------
merge-recursive.h | 6 -----
unpack-trees.c | 56 +++++++++++++++++++++++++++++++++++++++++++++------
unpack-trees.h | 7 ++++++
6 files changed, 59 insertions(+), 62 deletions(-)
--
1.7.2.2.175.ga619d.dirty
--
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