From: "Philip Oakley" <philipoakley@iee.org>
To: "Stefan Beller" <sbeller@google.com>,
"Junio C Hamano" <gitster@pobox.com>
Cc: "Jonathan Nieder" <jrnieder@gmail.com>, <git@vger.kernel.org>,
"Petr Baudis" <pasky@suse.cz>, "Heiko Voigt" <hvoigt@hvoigt.net>
Subject: Re: [PATCH] submodule documentation: Reorder introductory paragraphs
Date: Fri, 22 May 2015 18:35:41 +0100 [thread overview]
Message-ID: <05CAAED4A70A416590A620BF584E7F3D@PhilipOakley> (raw)
In-Reply-To: CAGZ79kYiG9=px3P+k1shqvt8ouXmfJjeKgCarj6KEQy08WAmjg@mail.gmail.com
From: "Stefan Beller" <sbeller@google.com>
> On Fri, May 22, 2015 at 7:36 AM, Junio C Hamano <gitster@pobox.com>
> wrote:
>> Stefan Beller <sbeller@google.com> writes:
>>
>>> On Thu, May 21, 2015 at 1:03 PM, Philip Oakley
>>> <philipoakley@iee.org> wrote:
>>>>> +Submodules are not to be confused with remotes, which are meant
>>>>> +mainly for branches of the same project;
>>>>
>>>> This use of 'branches' didn't work for me. "remotes are meant
>>>> mainly for
>>>> branches of the same project" ?
>>
>> The "branch" in the original is used in a much wider sense than
>> usual branch (i.e. ref/heads/ thing you have locally); it refers to
>> forks of the same project but with a bit of twist. When you say
>> repository A is a fork of the same project as my local repository,
>> you would give an impression that A is not the authoritative copy of
>> the project. But you can say my repository and that repository A
>> are branches of the same project, you give zero information as to
>> A's authoritativeness.
>
> While this is correct, I think it is also confusing, because 'branch'
> is a command which deals with local branches only in my perception
> To deal with remote branches you need to use the commands
> {remote, fetch, pull}.
>
> So when someone mentions "branch" I need to think of local operations
> in one repository and not on different distributed histories.
>
If we are having difficulties defining a "remote" here (its not defined
in gitglossary.txt anyway), why not simply put a full stop (period)
after the "Submodules are not to be confused with remotes.", and bypass
the problem, avoiding digging the hole deeper.
>>
>>> Submodules should not be confused with remote repositories,
>>> which are
>>> meant to track the same repository, just at another location;
>>> ...
>>
>> I do not think this is a great improvement. You now conflated
>> "repository" to mean "project" in the latter half of the sentence,
>> while you are trying to explain what a "remote repository" is.
>
> That's true.
>
>>
>> Your copy of git.git is not the same repository as mine; they have
>> different histories. Both repositories are used to work on the same
>> project. "submoules are not remotes, which are other repositories
>> of the same project", perhaps?
>
> That makes sense.
>
If maybe that the feature we should pick on is the common root of the
development between the local and remote repository, and quite distinct
for the submodule. This allows remotes to be on the same machine, as
well as distant machines and server.
It is I believe technically possible to have a submodule which is its
own super project, with and without recursion, but would be very
atypical, and would belong in the 'don't do that' category
next prev parent reply other threads:[~2015-05-22 17:35 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-20 23:11 [PATCH] submodule documentation: Reorder introductory paragraphs Stefan Beller
2015-05-21 13:04 ` Heiko Voigt
2015-05-21 17:24 ` Junio C Hamano
2015-05-21 17:43 ` Stefan Beller
2015-05-21 20:03 ` Philip Oakley
2015-05-21 22:08 ` Stefan Beller
2015-05-22 6:59 ` Philip Oakley
2015-05-22 14:36 ` Junio C Hamano
2015-05-22 17:05 ` Stefan Beller
2015-05-22 17:26 ` Junio C Hamano
2015-05-22 17:35 ` Philip Oakley [this message]
2015-05-22 17:51 ` Stefan Beller
2015-05-22 19:47 ` Philip Oakley
-- strict thread matches above, loose matches on Subject: below --
2015-05-22 19:38 Stefan Beller
2015-05-22 21:18 ` Philip Oakley
2015-05-25 22:00 ` Junio C Hamano
2015-05-26 17:53 ` Stefan Beller
2015-05-26 21:58 ` Heiko Voigt
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
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=05CAAED4A70A416590A620BF584E7F3D@PhilipOakley \
--to=philipoakley@iee.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=hvoigt@hvoigt.net \
--cc=jrnieder@gmail.com \
--cc=pasky@suse.cz \
--cc=sbeller@google.com \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).