From: Junio C Hamano <gitster@pobox•com>
To: Stefan Beller <sbeller@google•com>
Cc: Philip Oakley <philipoakley@iee•org>,
"git\@vger.kernel.org" <git@vger•kernel.org>,
Heiko Voigt <hvoigt@hvoigt•net>
Subject: Re: [PATCH] glossary: add "remote" and "submodule"
Date: Wed, 27 May 2015 16:05:31 -0700 [thread overview]
Message-ID: <xmqqwpztiptw.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <CAGZ79kbz6d8j1p5d-pO2cpou76ivhkCQPq4cpGxozc-9cnACPQ@mail.gmail.com> (Stefan Beller's message of "Wed, 27 May 2015 15:59:41 -0700")
Stefan Beller <sbeller@google•com> writes:
>>> +[[def_submodule]]submodule::
>>> + A <<def_repository,repository>> inside another repository. The two
>>> + repositories have different history, though the outer repository
>>> + knows the commit of the inner repository.
>>
> ... But correctness trumps brevity indeed.
I do not think the correct way is that much longer, though.
A repository inside another repository. The two repositories have different history
A repository that holds the history of a separate project inside another repository
Heh, they are the same length, no?
>
>>
>> A repository that holds the history of a separate project
>> inside another repository (the latter of which is called
>> superproject).
>
> This is better than what I proposed, but confusing. When naming
> a project a submodule, my mental standpoint is the superproject.
> ("This project has the submodule foo and bar"). But In your description
> the superproject is called "another repository".
That is because you are adding an entry for "submodule" to the
glossary, no? I was writing from submodule's point of view, i.e. "I
(submodule) is inside another repository, and my project is separate
from that other repository's".
>> The containing superproject knows about the
>> names of (but does not hold copies of) commit objects of the
>> contained submodules.
>
> That makes sense to point out here. Though should we also introduce
> "superproject" now?
Yes, that is what I was hinting at.
next prev parent reply other threads:[~2015-05-27 23:05 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-27 21:13 [PATCH] glossary: add "remote" and "submodule" Stefan Beller
2015-05-27 22:29 ` Junio C Hamano
2015-05-27 22:59 ` Stefan Beller
2015-05-27 23:05 ` Junio C Hamano [this message]
2015-05-27 23:29 ` Stefan Beller
2015-05-28 1:50 ` [PATCH] glossary: add "remote", "submodule", "superproject" Stefan Beller
2015-05-28 16:45 ` Junio C Hamano
2015-05-28 17:52 ` Stefan Beller
2015-05-28 18:50 ` Junio C Hamano
Reply instructions:
You may reply publicly 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqwpztiptw.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=hvoigt@hvoigt$(echo .)net \
--cc=philipoakley@iee$(echo .)org \
--cc=sbeller@google$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox