git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
Cc: GIT Mailing-list <git@vger.kernel.org>
Subject: Re: [PATCH] config.c: Remove unused git_config_global() function
Date: Tue, 31 May 2011 10:51:06 -0700	[thread overview]
Message-ID: <7vy61miws5.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <4DE5241E.9030000@ramsay1.demon.co.uk> (Ramsay Jones's message of "Tue, 31 May 2011 18:23:42 +0100")

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.

  reply	other threads:[~2011-05-31 17:51 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-05-31 17:23 [PATCH] config.c: Remove unused git_config_global() function Ramsay Jones
2011-05-31 17:51 ` Junio C Hamano [this message]
2011-05-31 18:21   ` Effectively navigating branch history (was: Re: [PATCH] config.c: Remove unused git_config_global() function) Stephen Bash
2011-05-31 18:40     ` Effectively navigating branch history Junio C Hamano
2011-05-31 18:51       ` Stephen Bash

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=7vy61miws5.fsf@alter.siamese.dyndns.org \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=ramsay@ramsay1.demon.co.uk \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).