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

Re: [RFC PATCH 00/10] Make submodules work if .gitmodules is not checked out

From
Stefan Beller <sbeller@google.com>
Date
May 15, 2018, 01:14 UTC
Message-ID
<CAGZ79kYACxYyUKz95cRL_HeeCxzyG28sbTF+xO4KBgYW89PqaA@mail.gmail.com>
In-Reply-To
<20180514105823.8378-1-ao2@ao2.it>
Hi Antonio,
thanks for sending this series! Happy to review it!
>   - my git terminology may still be a little off: do "work tree" and
>     "work directory" mean the same thing?

Back in the old days, you had a "worktree" which is a directory where things are checked out and you modify files. It sort of the opposite of the "git directory", which git uses to store all its information.

Then quite some time later, the command git-worktree was invented. Now we had 2 things with the same name, which is unfortunate. But as the command git-worktree added more of these directories that you could work in, the name collision was not apparent.

Later when people noticed the subtle difference between the command and the thing on the file system, consensus seemed to be that the thing on the file system should rather be called "working tree" such that it sounds very similar but is distinguishable from the command.

However the outcome of the discussion did not yield a bi&complete refactoring of the code base, such that there are still places with "worktree" referring to the thing on the FS, "working trees".

I am not aware that "working directory" is an official term we use in any documentation for Git, but it sounds like you mean a "working tree". (From a point of view not based on the version control, "working directory" may sound more correct, note however as the directories in Git are named trees, the working "tree" sounds as if you can make changes to Git trees, ... which you can. :) )

> If anyone wanted to pick up and finish the work feel free to do so,
> otherwise please comment and I'll try to address issues as time permits.
First let's review this series. :)

Thanks, Stefan

Previous: Stefan BellerNext: Junio C Hamano
Message 26 of 27 in “Make submodules work if .gitmodules is not checked out”
  1. 00/10 Make submodules work if .gitmodules is not checked outAntonio Ospite, May 14, 2018
  2. 03/10 t7411: be nicer to other tests and really clean things upAntonio Ospite, May 14, 2018
  3. Stefan BellerMay 15, 2018
  4. Antonio OspiteJun 20, 2018
  5. 02/10 submodule: factor out a config_gitmodules_set functionAntonio Ospite, May 14, 2018
  6. Stefan BellerMay 15, 2018
  7. Antonio OspiteJun 20, 2018
  8. 04/10 submodule--helper: add a new 'config' subcommandAntonio Ospite, May 14, 2018
  9. Stefan BellerMay 15, 2018
  10. Antonio OspiteJun 20, 2018
  11. 01/10 config: make config_from_gitmodules generally usefulAntonio Ospite, May 14, 2018
  12. Brandon WilliamsMay 14, 2018
  13. Antonio OspiteJun 20, 2018
  14. Stefan BellerMay 15, 2018
  15. Antonio OspiteJun 20, 2018
  16. Stefan BellerJun 20, 2018
  17. Antonio OspiteJun 21, 2018
  18. Stefan BellerJun 21, 2018
  19. 05/10 submodule: use the 'submodule--helper config' commandAntonio Ospite, May 14, 2018
  20. 06/10 submodule--helper: add a '--stage' option to the 'config' sub commandAntonio Ospite, May 14, 2018
  21. 07/10 submodule: use 'submodule--helper config --stage' to stage .gitmodulesAntonio Ospite, May 14, 2018
  22. 08/10 t7506: cleanup .gitmodules properly before setting up new scenarioAntonio Ospite, May 14, 2018
  23. 10/10 t7415: add new test about using HEAD:.gitmodules from the indexAntonio Ospite, May 14, 2018
  24. 09/10 submodule: support reading .gitmodules even when it's not checked outAntonio Ospite, May 14, 2018
  25. Stefan BellerMay 15, 2018
  26. Stefan BellerMay 15, 2018
  27. Junio C HamanoMay 15, 2018

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.