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

Re: [PATCH 0/4] Multiple worktrees vs. submodules fixes

From
Junio C Hamano <gitster@pobox.com>
Date
Oct 15, 2014, 17:09 UTC
Message-ID
<xmqq1tq9xnrs.fsf@gitster.dls.corp.google.com>
In-Reply-To
<CACsJy8AmBr2YTJkVw4BDD95RVE91EEBtEyakOpb77NDXaVBzJA@mail.gmail.com>
Duy Nguyen <pclouds@gmail.com> writes:
Show 25 quoted lines
> On Wed, Oct 15, 2014 at 3:31 AM, Max Kirillov <max@max630.net> wrote:
>> On Tue, Oct 14, 2014 at 07:09:45PM +0200, Jens Lehmann wrote:
>>> Until that problem is solved it looks wrong to pass
>>> GIT_COMMON_DIR into submodule recursion, I believe
>>> GIT_COMMON_DIR should be added to the local_repo_env array
>>> (and even if it is passed on later, we might have to
>>> append "/modules/<submodule_name>" to make it point to the
>>> correct location).
>>
>> Actually, why there should be an _environment_ variable
>> GIT_COMMON_DIR at all? I mean, gitdir is resolved to some
>> directory (through link or environment), and it contains the
>> shared data directly or referes to it with the commondir
>> link. In which case anyone would want to override that
>> location?
>
> It's how the implementation was built up. First I split the repo in
> two and I need something to point the new/shared part.
> $GIT_DIR/worktrees comes later to glue them up. Keeping it an
> environment variable gives us a possibility to glue things up in a
> different way than using $GIT_DIR/worktrees. Of course the odds of
> anybody doing that are probably small or even near zero.
>
> Still consuming the rest of this thread. Thanks all for working on the
> submodule support for this.

Hmph. I was hoping that the multiple-work-trees topic was ready for 'next' by now, but we may want to wait to see how the interaction with submodule plays out to have another chance of a clean reroll before it happens. This is a topic with large impact and is quite intrusive code-wise, even though the intrusive parts are cleanly done. So we'd want to take more time to unleash it to the general public than more usual small scale topics, anyway.

Thanks.
Previous: Duy NguyenNext: Duy Nguyen
Message 22 of 24 in “Multiple worktrees vs. submodules fixes”
  1. 0/4 Multiple worktrees vs. submodules fixesMax Kirillov, Oct 12, 2014
  2. 1/4 checkout: do not fail if target is an empty directoryMax Kirillov, Oct 12, 2014
  3. 2/4 submodule refactor: use git_path_submodule() in add_submodule_odb()Max Kirillov, Oct 12, 2014
  4. 3/4 git-common-dir: make "modules/" per-working-directory directoryMax Kirillov, Oct 12, 2014
  5. 4/4 path: implement common_dir handling in git_path_submodule()Max Kirillov, Oct 12, 2014
  6. Duy NguyenOct 14, 2014
  7. Jens LehmannOct 14, 2014
  8. Junio C HamanoOct 14, 2014
  9. Max KirillovOct 14, 2014
  10. Jens LehmannOct 14, 2014
  11. Max KirillovOct 14, 2014
  12. Duy NguyenOct 15, 2014
  13. Jens LehmannOct 15, 2014
  14. Max KirillovOct 16, 2014
  15. Jens LehmannOct 19, 2014
  16. Max KirillovOct 20, 2014
  17. Duy NguyenNov 3, 2014
  18. Jens LehmannNov 3, 2014
  19. Max KirillovNov 3, 2014
  20. Max KirillovOct 14, 2014
  21. Duy NguyenOct 15, 2014
  22. Junio C HamanoOct 15, 2014
  23. Duy NguyenOct 17, 2014
  24. Jens LehmannOct 19, 2014

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.