Re: [PATCH] merge: default to @{upstream}

From: Felipe Contreras <felipe.contreras@gmail.com>
Date: Jan 28, 2011, 18:46 UTC
Message-ID: <AANLkTi=iMJv+Jtj8YdYhQ_sxu+jBht5YqvSnkS2LUerz@mail.gmail.com>
In-Reply-To: <20110128175609.GA27118@burratino>

On Fri, Jan 28, 2011 at 7:56 PM, Jonathan Nieder <jrnieder@gmail.com> wrote:

> Other nits: documentation?  tests?  The rest of cmd_merge does not
> rely on argv[argc] being NULL, but it might make sense to set argv[1]
> to NULL anyway for futureproofing.

Sure, I need to add documentation and tests. I should probably have sent this as 'RFC'.

Anyway, I don't think we can set argv[1] to NULL, because it's possible that this is "char *argv[1]", so that would crash. The only thing the standard ensures, is that the last one would be NULL, so argv[argc] = NULL, and therefore we can override it, as long as the rest of the code checks for argc instead of NULL, which AFAIK in the whole git code it is the case, and certainly in builtin_merge.c AFAICS.

Cheers.

-- 
Felipe Contreras