From: Bert Wesarg Date: Wed, 25 Aug 2010 07:22:34 GMT Subject: Re: [PATCH v2] git-merge: ignore space support Message-ID: In-Reply-To: <20100825044006.GJ11619@burratino> Hi, On Wed, Aug 25, 2010 at 06:40, Jonathan Nieder wrote: > Justin Frankel wrote: > >> Fine by me... (ok if I were to nitpick I would probably make most of >> the internal static functions check that opts was non-NULL before >> dereferencing, in case the calling code ever changed > > Not a bad idea.  I'll squash in something like this. > > A real BUG_ON macro would make this less ugly. I think exactly because of this there is no prior art of using NULL as 'use the default options'. Without this all these NULL pointer checks wont be necessary. Bert