Take 3. Addressed the issue that Junio turned up the last time I sent this out for review. I'm not entirely sure I like the way I added the tests in the first patch, but it's unclear to me if there's actually a pattern for setting up and tearing down the same env for multiple test methods. There are also other tests in t7501 that rely on state left from earlier tests, so it's not really clear to me what the best thing to do here is. Also added a FIXME in the second patch for something I think should be fixed, but doesn't make sense to fix in this patch series. Samuel Lijin (3): t7501: add merge conflict tests for dry run wt-status: teach wt_status_collect about merges in progress commit: fix exit code for --short/--porcelain builtin/commit.c | 32 +++--- ref-filter.c | 3 +- t/t7501-commit.sh | 49 +++++++-- wt-status.c | 260 +++++++++++++++++++++++++--------------------- wt-status.h | 13 +-- 5 files changed, 208 insertions(+), 149 deletions(-) -- 2.18.0
