Hi Peff, On Tue, 5 Jul 2016, Jeff King wrote: > By the way, I notice that the error message when concat fails is just: > > if (parse_options_concat(options, ARRAY_SIZE(options), cp_extra)) > die(_("program error")); > > Should this become: > > die("BUG: not enough room to concatenate options"); > > as part of your BUG cleanups elsewhere? Not really. I do not have time for a crusade through all of the die() statements to determine whether they're really bug reports. You refer to my clean-up of merge-recursive.c, right? That was a necessary prerequisite for the patch to stop die()ing in case of errors. Ciao, Dscho -- 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