From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 31 May 2011 17:51:06 GMT
Subject: Re: [PATCH] config.c: Remove unused git_config_global() function
Message-ID: <7vy61miws5.fsf@alter.siamese.dyndns.org>
In-Reply-To: <4DE5241E.9030000@ramsay1.demon.co.uk>

Ramsay Jones <ramsay@ramsay1.demon.co.uk> writes:

> Commit 8f323c00 (drop support for GIT_CONFIG_NOGLOBAL, 15-03-2011)
> removed the git_config_global() function, among other things, since
> it is no longer required. Unfortunately, this function has since
> been unintentionally restored; I suspect by merge commit 25b86e45
> (Merge branch 'jk/maint-config-alias-fix' into next, 25-05-2011).

Yeah, I think it was 1f9a980636 which was a merge between fb674d7 and
73546c0.  I just compared the output between these two:

   $ git diff fb674d7...73546c0 -- config.c ;# what the topic did
   $ git diff fb674d7 1f9a980 -- config.c   ;# what was merged

and indeed I can see these four lines snuck in by accidental faulty
conflict resolution. My bad.

Thanks for spotting.