Re: [PATCH 6/6] Teach core object handling functions about gitlinks

From: Junio C Hamano <junkio@cox.net>
Date: Apr 10, 2007, 20:19 UTC
Message-ID: <7vwt0kugmy.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <Pine.LNX.4.64.0704101219280.6730@woody.linux-foundation.org>

Linus Torvalds <torvalds@linux-foundation.org> writes:

Show 6 quoted lines

> On Tue, 10 Apr 2007, Andy Parkins wrote:
>> 
>> Would it be nicer if .gitmodules were line-based to aid in merging?
>
> I seriously doubt you'll ever be merging or changing this a lot. So I 
> don't think it's a huge concern.

I think Andy's comment comes from our earlier discussion on the other in-tree configuration, .gitattributes file.

We were talking about using in-tree .gitattributes for deciding if we apply crlf to each paths and other things like which 3-way file-level merge backend to apply, and need to make the system gracefully degrade even when in-tree .gitattributes have conflict markers during a merge. And for that purpose, it is certainly easier to arrange "pick each line, while ignoring <<< or === or >>>, and if there are conflicting duplicates do something sensible about them", if the file is line oriented.

But I do not think the .gitmodules thing needs that. If we have conflicting (or non-conflicting for that matter) submodule moves, that's a _MAJOR_ project re-organization, and I do not think we would even want to automatically descend into submodules for merging or checking-out when we have such a situation in the higher level project.