From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 30 Jun 2011 00:47:18 GMT
Subject: Re: [PATCH] submodule add: always initialize .git/config entry
Message-ID: <7vwrg4qh61.fsf@alter.siamese.dyndns.org>
In-Reply-To: <4E066E8A.7060209@web.de>

Jens Lehmann <Jens.Lehmann@web.de> writes:

> Am 24.06.2011 06:13, schrieb Junio C Hamano:
>> Shouldn't "submodule add" add an entry for .git/config even when it cloned
>> from elsewhere?
>
> Yes, we should be consistent here.
>
>> I suspect this fix will cascade to breakage elsewhere, but I've run out of
>> energy and inclination to look at the submodule code tonight, so I'll let
>> the list to take it further from here.
>
> Ok, t7406 expected "git submodule init" to copy the new update setting
> into .git/config for a newly added submodule, which it didn't do anymore
> because it already found the url set. I solved that by teaching init to
> only then copy the url and update settings if they aren't present yet.
> Now all tests are running fine and your change to the test I added in
> jl/submodule-add-relurl-wo-upstream isn't necessary anymore.
>
> When I cherry pick that onto cbd0a3c6bc in your current pu branch and
> resolve the conflicts all tests run fine (if you want me to resend this
> patch based on that commit to avoid the conflicts with i18n and the
> "submodule add: clean up duplicated code" patch please just say so).

Hmm, now 7610 seems to expect somewhat different behaviour and fails.