Re: What's cooking in git.git (Apr 2014, #08; Fri, 25)

[Jeff King <peff@peff.net>]

On Mon, Apr 28, 2014 at 10:48:21AM -0700, Junio C Hamano wrote:

> > diff --git a/diff.c b/diff.c
> > index 54d5308..a03744b 100644
> > --- a/diff.c
> > +++ b/diff.c
> > @@ -2894,7 +2894,7 @@ static void run_external_diff(const char *pgm,
> >  			      int complete_rewrite,
> >  			      struct diff_options *o)
> >  {
> > -	const char *spawn_arg[10];
> > +	const char *spawn_arg[11];
> >  	int retval;
> >  	const char **arg = &spawn_arg[0];
> >  	struct diff_queue_struct *q = &diff_queued_diff;
> >
> > as a fix for maint/2.0.0 in the interim. I can write a commit message
> > for that if you're interested.
> 
> I think we should merge the first one (and possibly the second one,
> too) as-is for 2.0 instead.  No change can possibly be more
> trivially correct than these two ;-)

I'm fine with that. The second patch is pure clean-up and doesn't fix
anything (because the "3" in the env array is actually correct), so it
can happily wait for the next cycle.

-Peff