git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH 0/6] git-rm absorbs submodule git directory before deletion

From
Stefan Beller <sbeller@google.com>
Date
Dec 13, 2016, 19:07 UTC
Message-ID
<CAGZ79kY_E8xnOpCAFQo_91FeQCs9X3fkassFYunG=adx81AcBg@mail.gmail.com>
In-Reply-To
<xmqq37hr4q5t.fsf@gitster.mtv.corp.google.com>
On Tue, Dec 13, 2016 at 10:53 AM, Junio C Hamano <gitster@pobox.com> wrote:
Show 19 quoted lines
> Stefan Beller <sbeller@google.com> writes:
>
>> On Mon, Dec 12, 2016 at 11:28 PM, Junio C Hamano <gitster@pobox.com> wrote:
>>> Stefan Beller <sbeller@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.
Show 7 quoted lines
>  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

Show 9 quoted lines
>
>> 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

Previous: Junio C HamanoNext: Junio C Hamano
Message 14 of 21 in “git-rm absorbs submodule git directory before deletion”
  1. 0/6 git-rm absorbs submodule git directory before deletionStefan Beller, Dec 13, 2016
  2. 2/6 submodule: modernize ok_to_remove_submodule to use argv_arrayStefan Beller, Dec 13, 2016
  3. 4/6 ok_to_remove_submodule: absorb the submodule git dirStefan Beller, Dec 13, 2016
  4. 1/6 submodule.h: add extern keyword to functionsStefan Beller, Dec 13, 2016
  5. 3/6 submodule: add flags to ok_to_remove_submoduleStefan Beller, Dec 13, 2016
  6. 6/6 rm: add absorb a submodules git dir before deletionStefan Beller, Dec 13, 2016
  7. brian m. carlsonDec 13, 2016
  8. Stefan BellerDec 13, 2016
  9. David TurnerDec 13, 2016
  10. 5/6 t3600: slightly modernize styleStefan Beller, Dec 13, 2016
  11. Junio C HamanoDec 13, 2016
  12. Stefan BellerDec 13, 2016
  13. Junio C HamanoDec 13, 2016
  14. Stefan BellerDec 13, 2016
  15. Junio C HamanoDec 13, 2016
  16. Stefan BellerDec 13, 2016
  17. Stefan BellerDec 13, 2016
  18. Junio C HamanoDec 13, 2016
  19. Stefan BellerDec 13, 2016
  20. Stefan BellerDec 13, 2016
  21. Junio C HamanoDec 13, 2016

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.