On Wed, Jul 06, 2016 at 09:03:44AM +0200, Johannes Schindelin 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. Yeah. I didn't look at it all that closely, but it looked like you hit places outside of merge-recursive, too. I agree it is not worth including unless you are crusading, though (and anyway, my patch gets rid of the message entirely). -Peff -- 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