From: Thomas Braun Date: Thu, 12 Oct 2017 11:48:50 GMT Subject: Re: Branch switching with submodules where the submodule replaces a folder aborts unexpectedly Message-ID: <591155758.21471.1507808930483@ox.hosteurope.de> In-Reply-To: > Stefan Beller hat am 9. Oktober 2017 um 23:59 geschrieben: > > > On Mon, Oct 9, 2017 at 2:29 PM, Thomas Braun > wrote: > > Hi, > > > > I'm currently in the progress of pulling some subprojects in a git repository of mine into their > > own repositories and adding these subprojects back as submodules. > > > > While doing this I enountered a potential bug as checkout complains on branch switching that a > > file already exists. > > (And I presume you know about --recurse-submodules as a flag for git-checkout) No I did not know about it. I tend to not know options which don't complete in my shell (patch follows for that). > This is consistent with our tests, unfortunately. > > git/t$ ./t2013-checkout-submodule.sh > ... > not ok 15 - git checkout --recurse-submodules: replace submodule with > a directory # TODO known breakage > ... > > > If I'm misusing git here I'm glad for any advice. > > You are not. Glad to know that. > Apart from this bug report, would you think that such filtering of > trees into submodules (and back again) might be an interesting feature > of Git or are these cases rare and special? For me not particularly. In my case it is a one time thing going from an embedded project folder to a submodule.