I found a problem while writing the test for -1: the first patch is a correction for that; sorry I didn't detect it earlier. The second and third patches are rewrites of the tests I submitted earlier- the rest of the file needs to be cleaned up to match this style. Thanks Jonathan. Ramkumar Ramachandra (3): fmt-merge-msg: Disallow '--log', 'merge.log' < 0 t6200-fmt-merge-msg: Exercise 'merge.log' to configure shortlog length t6200-fmt-merge-msg: Exercise '--log' to configure shortlog length builtin/fmt-merge-msg.c | 4 +++- builtin/merge.c | 2 +- t/t6200-fmt-merge-msg.sh | 123 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 127 insertions(+), 2 deletions(-) -- 1.7.2.2.409.gdbb11.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