From: Junio C Hamano Date: Thu, 23 Apr 2015 03:47:16 GMT Subject: Re: [PATCH] pathspec: adjust prefixlen after striping trailing slash Message-ID: In-Reply-To: <5538218B.4010400@web.de> On Wed, Apr 22, 2015 at 3:32 PM, Jens Lehmann wrote: > ... >> But it is unclear if we should still do (2) when "subrepo/.git" is >> no longer there. That has to be done manually and it may be an >> indication that is clear enough that the end user wants the >> directory to be a normal directory without any submodule involved, >> in which case it may match the expectation of the user better to >> just nuke the corresponding 160000 entry in the index and replace it >> with files in there. I dunno. > > The user having removed subrepo/.git is just one reason for that. > Another is a user adding a file in an unpopulated work tree of a > not initialized submodule. I doubt that simply nuking the 160000 > entry would be the right thing to do in this case, I expect this > to be a pilot error we should barf about ;-) OK, that sounds sensible.