From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jeff King Subject: Re: [PATCH 1/4] config: add include directive Date: Thu, 26 Jan 2012 17:43:50 -0500 Message-ID: <20120126224350.GA13241@sigill.intra.peff.net> References: <20120126073547.GA28689@sigill.intra.peff.net> <20120126073752.GA30474@sigill.intra.peff.net> <4F2119E6.8010109@viscovery.net> <20120126165456.GA5278@sigill.intra.peff.net> <7vmx9a2o23.fsf@alter.siamese.dyndns.org> <20120126222532.GA12855@sigill.intra.peff.net> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Cc: Johannes Sixt , git@vger.kernel.org To: Junio C Hamano X-From: git-owner@vger.kernel.org Thu Jan 26 23:43:59 2012 Return-path: Envelope-to: gcvg-git-2@lo.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1RqY2w-0004lF-Tj for gcvg-git-2@lo.gmane.org; Thu, 26 Jan 2012 23:43:59 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753516Ab2AZWny (ORCPT ); Thu, 26 Jan 2012 17:43:54 -0500 Received: from 99-108-226-0.lightspeed.iplsin.sbcglobal.net ([99.108.226.0]:46040 "EHLO peff.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751775Ab2AZWny (ORCPT ); Thu, 26 Jan 2012 17:43:54 -0500 Received: (qmail 30343 invoked by uid 107); 26 Jan 2012 22:50:55 -0000 Received: from sigill.intra.peff.net (HELO sigill.intra.peff.net) (10.0.0.7) (smtp-auth username relayok, mechanism cram-md5) by peff.net (qpsmtpd/0.84) with ESMTPA; Thu, 26 Jan 2012 17:50:55 -0500 Received: by sigill.intra.peff.net (sSMTP sendmail emulation); Thu, 26 Jan 2012 17:43:50 -0500 Content-Disposition: inline In-Reply-To: <20120126222532.GA12855@sigill.intra.peff.net> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: On Thu, Jan 26, 2012 at 05:25:32PM -0500, Jeff King wrote: > There's a slight complication with when to clear the "I have seen this" > mark for each source. If you are interested only in breaking cycles, > then obviously you can just clear the marks as you pop the stack. But if > you want to stop repeated inclusion down different branches of the > include tree, you need to keep the marks until you're done (e.g., the > same file referenced by .git/config and ~/.gitconfig). But you do still > need to clear them, because we repeatedly call git_config with different > callback functions, and we need to re-parse each time. > > I think it should be sufficient to make the marks live through > git_config(), and get cleared after that (so all of .git/config, > ~/.gitconfig, and /etc/gitconfig will only load a given include once, > but another call to git_config will load it again). Ugh, actually it's a little trickier. Because a git_config callback can call git_config again, we want one set of marks per git_config invocation, but we need to handle two simultaneous invocations. But I think it's OK. We can stuff the data into the "git_config_include_data", which has the proper scope. -Peff