On Tue, Dec 13, 2016 at 10:53 AM, Junio C Hamano <gits...@pobox.com> wrote: > Stefan Beller <sbel...@google.com> writes: > >> On Mon, Dec 12, 2016 at 11:28 PM, Junio C Hamano <gits...@pobox.com> wrote: >>> Stefan Beller <sbel...@google.com> writes: >>> >>>> The "checkout --recurse-submodules" series got too large to comfortably >>>> send >>>> it out for review, so I had to break it up into smaller series'; this is >>>> the >>>> first subseries, but it makes sense on its own. >>>> >>>> This series teaches git-rm to absorb the git directory of a submodule >>>> instead >>>> of failing and complaining about the git directory preventing deletion. >>>> >>>> It applies on origin/sb/submodule-embed-gitdir. >>> >>> Thanks. I probably should rename the topic again with s/embed/absorb/; >> >> I mostly renamed it in the hope to settle our dispute what embedding means. >> ;) > > I do not think there is no dispute about what embedding means.
double negative: You think we have a slight dispute here. > A > submodule whose .git is inside its working tree has its repository > embedded. > > What we had trouble settling on was what to call the operation to > undo the embedding, unentangling its repository out of the working > tree. I'd still vote for unembed if you want a name to be nominated. So I can redo the series with two commands "git submodule [un]embed". For me "unembed" == "absorb", such that we could also go with absorb into superproject <-> embed into worktree > >> Note that sb/t3600-cleanup is part of this series now, >> (The first commit of that series is in patch 6/6 of this series, and patch 5 >> is >> the modernization effort.) > > Well, "t3600: remove useless redirect" has been in 'next' already; > do you mean that you want me to queue this series on top of that > topic? > I need to reroll this series any way; the reroll will be on top of that. Thanks, Stefan
