From: Stefan Beller <firstname.lastname@example.org> To: Jonathan Tan <email@example.com> Cc: "firstname.lastname@example.org" <email@example.com> Subject: Re: [RFC/PATCH] submodules: overhaul documentation Date: Tue, 20 Jun 2017 12:15:24 -0700 Message-ID: <CAGZ79kaEtOiQ7k6HOdzqmqgzKAjbd3UDzq4tB+zj1Hi9YpiF1Q@mail.gmail.com> (raw) In-Reply-To: <firstname.lastname@example.org> On Tue, Jun 20, 2017 at 11:18 AM, Jonathan Tan <email@example.com> wrote: >> +DESCRIPTION >> +----------- >> + >> +A submodule is another Git repository tracked in a subdirectory of your >> +repository. The tracked repository has its own history, which does not >> +interfere with the history of the current repository. >> + >> +Submodules are composed from a so-called `gitlink` tree entry >> +in the main repository that refers to a particular commit object >> +within the inner repository. >> + >> +Additionally to the gitlink entry the `.gitmodules` file (see >> +linkgit:gitmodules) at the root of the source tree contains >> +information needed for submodules. The only required information >> +is the path setting, which estabishes a logical name for the submodule. > > I know that this was copied over, but this is confusing to me, so it > might be worthwhile to change it. In particular, `gitlink` is, as far as > I know, the type of the child object, correct > not any sort of tree entry. I Well a tree references (a) other trees (b) blobs or (c) gitlinks, so calling a gitlink a tree-entry is correct, but maybe confusing. > would rewrite this as: > > A submodule consists of a tracking subdirectory and an entry in the > `.gitmodules` file (see linkgit:gitmodules). A submodule consists of a tracking subdirectory [in the working directory] and an entry in the `.gitmodules` file (see linkgit:gitmodules). > The tracking subdirectory appears in the main repository as a > `gitlink` object (instead of a `tree` object). The parent of the > tracking subdirectory links to this `gitlink` object through its > hash, just like linking to a `tree` or `blob`. This `gitlink` object > contains the hash of a particular commit object of the submodule. > I think this is confusing, too. :) That is because a subdirectory exists on the FS, whereas the gitlink appears in gits representation of the world (in the tree). Maybe: The tracking subdirectory appears in the main repository at the point where it is tracked via the gitlink in the tree. It is empty when the submodule is not populated, otherwise it contains the content of the submodule repository. The gitlink object contains the hash of a particular commit object of the submodule. The .gitmodules file establishes a relationship between the path, which is where the gitlink is in the tree, and the logical name, which is used for the location of the submodules git directory. The .gitmodules file has the same syntax as the $Git_DIR/config file. The relationship mapping of path to name is done via setting submodule.<name value>.path = <path value>. The submodules git directory is found in in the main repositories '$GIT_DIR/modules/<name>' or inside the tracking subdirectory, but this is deprecated. > The entry in the `.gitmodules` file establishes the name of the > submodule (to be used as a reference by other entries and commands) > and references the tracking subdirectory as follows: > > submodule.my_submodule_name.path = path/to/my_submodule > > There might also be a need to mention that when the submodule is > populated (or whatever the right term is), the tracking subdirectory in > the working tree contains both the submodule's working tree and the > submodule's Git directory. See the alternative proposal above, the git directory is best kept outside the tracking subdirectory, but rather contained inside the superprojects git dir itself. > >> +The usual git configuration (see linkgit:git-config) can be used to >> +override settings given by the `.gitmodules` file. > > Not sure if this is relevant here. This is relevant for overwriting e.g. the submodule.NAME.url setting. > >> +Submodules can be used for two different use cases: > > A creative person might come up with more, so this might be better as: > > Submodules can be used for at least these use cases: ok. >> +1. Using another project that stands on its own. >> + When you want to use a third party library, submodules allow you to >> + have a clean history for your own project as well as for the library. >> + This also allows for updating the third party library as needed. > > Probably better as: > > 1. Using another project while maintaining independent history. > Submodules allow you to contain the working tree of another project > within your own working tree while keeping the history of both > projects separate. Also, since submodules are fixed to a hash, the "fixed to an arbitrary version" instead? > other project can be independently developed without affecting the > parent project, allowing the parent project to fix itself to new > versions only whenever desired. >> +2. Artificially split a (logically single) project into multiple >> + repositories and tying them back together. This can be used to >> + overcome deficiences in the data model of Git, such as: > > This should match the gerund used in point 1: > > 2. Splitting a (logically single) project into multiple > repositories. This can be used to overcome deficiencies in the data > model of Git, such as: as Junio pointed in a separate email out we'd not use "deficiencies in the data model" but something else. >> +* To have finer grained access control. >> + The design principles of Git do not allow for partial repositories to be >> + checked out or transferred. A repository is the smallest unit that a user >> + can be given access to. Submodules are separate repositories, such that >> + you can restrict access to parts of your project via the use of submodules. > > Not sure about this point - if the project is logically single, you > would probably need to see the entire project. Well no. Large projects do not require you to see everything. This can be a decision by yourself ("I am only here to fix grammar in the docs / I am only here to work on this niche feature contained in 3 submodules, so I don't want to download the whole thing") or by the project ("You are not trustworthy enough to read the 'sekret' submodule, which only our top engineers have access too but believe me you don't need it"). > If this is about > different teams independently working on different subcomponents, this > seems more like point 1 (inclusion of other projects). In the very first attempt of this man page overhaul I also had an example of big binary files, which were put in submodules, such that it could be understood as a solution to the same problem as git-LFS is offering. But this is not a long term solution, as you are working on fixing this for real. But that is how Android uses some repositories, today. >> +* In its current form Git scales up poorly for very large repositories that >> + change a lot, as the history grows very large. For that you may want to look >> + at shallow clone, sparse checkout, or git-LFS. >> + However you can also use submodules to e.g. hold large binary assets >> + and these repositories are then shallowly cloned such that you do not >> + have a large history locally. >> + >> +The data model >> +-------------- >> + >> +A submodule can be considered its own autonomous repository, that has a >> +worktree and a git directory at a different place than the superproject. > > Isn't the worktree inside the superproject's worktree? I would write > this as: > > A submodule is its own repository, having its own working tree and > Git directory. yes, but continued: The working tree is inside the superprojects working tree, at the place as bound via its (gitlink entry) path. The git directory may be either inside the working tree or contained inside the superprojects git directory. > >> +The superproject only records the commit object name in its tree, such that >> +any other information, e.g. where to obtain a copy from, is not recorded >> +in the core data structures of Git. The porcelain layer of Git however >> +makes use of the `.gitmodules` file that gives hints where and how to >> +obtain a copy of the submodule git repository from. > > I would write this as: > > Additional metadata (for example, from where this submodule was > obtained) can be written to the `.gitmodules` file, to be used by > the porcelain layer of Git. s/was obtained/can be obtained/ IMHO, but this sounds good. > >> +Submodule operations can be configured using the following mechanisms >> +(from highest to lowest precedence): >> + >> + * the command line for those commands that support taking submodule specs. >> + >> + * the configuration file `$GIT_DIR/config`. > > Which $GIT_DIR? The submodule or the superproject? superprojects > >> + * the configuration file `config` found in the `refs/submodule/config` branch. >> + This can be used to overwrite the upstream configuration in the `.gitmodules` >> + file without changing the history of the project. >> + Useful options here are overwriting the base, where relative URLs apply to, >> + when mirroring only parts of the larger collection of submodules. >> + >> + * the `.gitmodules` file inside the repository. A project usually includes this >> + file to suggest defaults for the upstream collection of repositories. > > Which .gitmodules? The submodule's or the superproject's? superprojects > >> +On the location of the git directory >> +------------------------------------ >> + >> +Since v1.7.7 of Git, the git directory of submodules is stored inside the >> +superprojects git directory at $GIT_DIR/modules/<submodule-name> > > Missing period at end of sentence. > > Also, is this always true? We discussed that at least sometimes, it is > in the .git directory of the tracking directory. > >> +This location allows for the working tree to be non existent while keeping >> +the history around. So we can use `git-rm` on a submodule without loosing >> +information that may only be local; it is also possible to checkout the >> +superproject before and after the deletion of the submodule without the >> +need to reclone the submodule as it is kept locally. > > For me, it is confusing to refer to it as a "submodule" after deletion, > since when you delete something, normally it no longer exists. Maybe > write this as: > > When a submodule is deleted using `git-rm`, its Git directory is > moved to the superproject in $GIT_DIR/modules/<submodule-name>. This > allows a submodule of the same name to later be re-added. Not just re-added but also it is kept around if you checkout an older commit. > Also, this seems like a strange feature to me - if there is a rationale, > maybe it could be added. The rationale is to not throw away the data, but you can reconstruct any state before its deletion locally without having to re-clone/fetch it. > > [snip] > >> +Deleting a submodule >> +-------------------- >> + >> +Deleting a submodule can happen on different levels: >> + >> +1) Removing it from the local working tree without tampering with >> + the history of the superproject. >> + >> +You may no longer need the submodule, but still want to keep it recorded >> +in the superproject history as others may have use for it. >> +-- >> + git submodule deinit <submodule path> >> +-- >> +will remove the configuration entries >> +as well as the work > > Incomplete sentence? Also, won't removing the configuration entries > tamper with the history of the superproject? (.gitmodules is usually > tracked, right?) configuration entries in the .git/config file that are overwriting the entries from the .gitmodules file. > >> +2) Remove it from history: >> +-- >> + git rm <submodule> >> +-- > > Does this completely delete the Git directory of the submodule too? > Above, it is stated that in such a case, the directory will be moved to > the superproject. > > Actually, after reading below, I see that it is not the case. I would > include the commit step and then mention how the whole thing can be > undone. > > git rm <submodule> > git commit > > This can be undone with `git revert`. That makes sense. > >> +3) Remove the submodules git directory: >> + >> +When you also want to free up the disk space that the submodules git >> +directory uses, you have to delete it manually. It is found in >> +`$GIT_DIR/modules`. >> +The steps 1 and 2 can be undone via `git submodule init` or >> +`git revert`, respectively. This step may incur data loss, >> +and cannot be undone. That is why there is no builtin. >> + >> +Other mechanisms >> +---------------- >> + >> +Git repositories are allowed to be kept inside other repositories without >> +the need to use submodules. This however does not enable cross-repository >> +versioning as the inner repository is unaware of the outer repository, >> +which in turn ignores the inner. > > Not sure if this is necessary. > >> +Submodules are not to be confused with remotes, which are other >> +repositories of the same project; submodules are meant for >> +different projects you would like to make part of your source tree, >> +while the history of the two projects still stays completely >> +independent and you cannot modify the contents of the submodule >> +from within the main project. >> +If you want to merge the project histories and want to treat the >> +aggregated whole as a single project from then on, you may want to >> +add a remote for the other project and use the 'subtree' merge strategy, >> +instead of treating the other project as a submodule. Directories >> +that come from both projects can be cloned and checked out as a whole >> +if you choose to go that route. >> + >> +Third party tools >> +----------------- >> + >> +There are a variety of third party tools that manage multiple repositories >> +and their relationships to each other, such as Androids repo tool or git-slave. >> +Often these tools lack cross repository versioning. >> + >> +https://source.android.com/source/using-repo >> + >> +http://gitslave.sourceforge.net/ > > Not sure if this is necessary. > >> +Implementation details >> +---------------------- >> + >> +When cloning or pulling a repository containing submodules the submodules >> +will not be checked out by default; You can instruct 'clone' to recurse > > semicolon -> period > >> +into submodules. The 'init' and 'update' subcommands of 'git submodule' >> +will maintain submodules checked out and at an appropriate revision in >> +your working tree. > > This part should probably be in the workflow section above. Also, above, > "git checkout" was introduced as a way to update the state of a > submodule - what's the difference between this and "git submodule > update"? checkout doesn't do any network traffic, whereas "submodule update" tries everything it can including re-clone to obtain the submodule at the recorded state.
next prev parent reply index Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-06-07 18:53 Stefan Beller 2017-06-13 19:29 ` Junio C Hamano 2017-06-13 21:06 ` Stefan Beller 2017-06-19 18:10 ` Brandon Williams 2017-06-20 21:42 ` Stefan Beller 2017-06-20 18:18 ` Jonathan Tan 2017-06-20 19:15 ` Stefan Beller [this message] 2017-06-20 22:56 ` [PATCHv2] " Stefan Beller 2017-06-21 3:45 ` Jonathan Tan 2017-06-21 17:25 ` Stefan Beller 2017-06-22 17:46 ` Brandon Williams 2017-06-22 18:54 ` Stefan Beller 2017-06-22 20:20 ` Junio C Hamano 2017-06-22 20:27 ` Stefan Beller 2017-06-22 21:03 ` Brandon Williams 2017-06-22 21:09 ` Stefan Beller 2017-06-22 21:01 ` [PATCHv3] " Stefan Beller
Reply instructions: You may reply publically to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style List information: http://vger.kernel.org/majordomo-info.html * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=CAGZ79kaEtOiQ7k6HOdzqmqgzKAjbd3UDzq4tB+zj1Hi9YpiF1Q@mail.gmail.com \ --firstname.lastname@example.org \ --email@example.com \ --firstname.lastname@example.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
email@example.com mailing list mirror (one of many) Archives are clonable: git clone --mirror https://public-inbox.org/git git clone --mirror http://ou63pmih66umazou.onion/git git clone --mirror http://czquwvybam4bgbro.onion/git git clone --mirror http://hjrcffqmbrq6wope.onion/git Newsgroups are available over NNTP: nntp://news.public-inbox.org/inbox.comp.version-control.git nntp://ou63pmih66umazou.onion/inbox.comp.version-control.git nntp://czquwvybam4bgbro.onion/inbox.comp.version-control.git nntp://hjrcffqmbrq6wope.onion/inbox.comp.version-control.git nntp://news.gmane.org/gmane.comp.version-control.git note: .onion URLs require Tor: https://www.torproject.org/ or Tor2web: https://www.tor2web.org/ AGPL code for this site: git clone https://public-inbox.org/ public-inbox