From: Jonathan Nieder Date: Sun, 30 Jan 2011 21:51:05 GMT Subject: Re: [PATCH] merge: default to @{upstream} Message-ID: <20110130215105.GA11332@burratino> In-Reply-To: Hi again, Felipe Contreras wrote: [out of order for convenience] > 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 original argc is at least 1 (to include "merge" as argv[0]) before the args are shifted by parse_options_end. But probably that is too tricky to rely on. > Sure, I need to add documentation and tests. I should probably have > sent this as 'RFC'. No problem. Thanks for keeping the topic alive.