summaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorShawn O. Pearce <sop@google.com>2012-10-26 12:18:00 -0700
committerShawn O. Pearce <sop@google.com>2012-10-26 12:24:57 -0700
commitcd81dd6403fc8dbe6ec5920c517d9083902c3c1f (patch)
tree935f3f82d2eb32c06b812f66d56d138074309ef8 /docs
parent80d2ceb22267b7dc61b107934ff5264b6439a785 (diff)
downloadgit-repo-cd81dd6403fc8dbe6ec5920c517d9083902c3c1f.tar.gz
Revert "Represent git-submodule as nested projects"v1.11.1
This reverts commit 69998b0c6ff724bf620480140ccce648fec7d6a9. Broke Android's non-gitmodule use case. Conflicts: project.py subcmds/sync.py Change-Id: I68ceeb63d8ee3b939f85a64736bdc81dfa352aed
Diffstat (limited to 'docs')
-rw-r--r--docs/manifest-format.txt15
1 files changed, 3 insertions, 12 deletions
diff --git a/docs/manifest-format.txt b/docs/manifest-format.txt
index a36af67c..f499868c 100644
--- a/docs/manifest-format.txt
+++ b/docs/manifest-format.txt
@@ -45,8 +45,7 @@ following DTD:
45 <!ELEMENT manifest-server (EMPTY)> 45 <!ELEMENT manifest-server (EMPTY)>
46 <!ATTLIST url CDATA #REQUIRED> 46 <!ATTLIST url CDATA #REQUIRED>
47 47
48 <!ELEMENT project (annotation?, 48 <!ELEMENT project (annotation?)>
49 project*)>
50 <!ATTLIST project name CDATA #REQUIRED> 49 <!ATTLIST project name CDATA #REQUIRED>
51 <!ATTLIST project path CDATA #IMPLIED> 50 <!ATTLIST project path CDATA #IMPLIED>
52 <!ATTLIST project remote IDREF #IMPLIED> 51 <!ATTLIST project remote IDREF #IMPLIED>
@@ -153,10 +152,7 @@ Element project
153 152
154One or more project elements may be specified. Each element 153One or more project elements may be specified. Each element
155describes a single Git repository to be cloned into the repo 154describes a single Git repository to be cloned into the repo
156client workspace. You may specify Git-submodules by creating a 155client workspace.
157nested project. Git-submodules will be automatically
158recognized and inherit their parent's attributes, but those
159may be overridden by an explicitly specified project element.
160 156
161Attribute `name`: A unique name for this project. The project's 157Attribute `name`: A unique name for this project. The project's
162name is appended onto its remote's fetch URL to generate the actual 158name is appended onto its remote's fetch URL to generate the actual
@@ -167,8 +163,7 @@ URL to configure the Git remote with. The URL gets formed as:
167where ${remote_fetch} is the remote's fetch attribute and 163where ${remote_fetch} is the remote's fetch attribute and
168${project_name} is the project's name attribute. The suffix ".git" 164${project_name} is the project's name attribute. The suffix ".git"
169is always appended as repo assumes the upstream is a forest of 165is always appended as repo assumes the upstream is a forest of
170bare Git repositories. If the project has a parent element, its 166bare Git repositories.
171name will be prefixed by the parent's.
172 167
173The project name must match the name Gerrit knows, if Gerrit is 168The project name must match the name Gerrit knows, if Gerrit is
174being used for code reviews. 169being used for code reviews.
@@ -176,8 +171,6 @@ being used for code reviews.
176Attribute `path`: An optional path relative to the top directory 171Attribute `path`: An optional path relative to the top directory
177of the repo client where the Git working directory for this project 172of the repo client where the Git working directory for this project
178should be placed. If not supplied the project name is used. 173should be placed. If not supplied the project name is used.
179If the project has a parent element, its path will be prefixed
180by the parent's.
181 174
182Attribute `remote`: Name of a previously defined remote element. 175Attribute `remote`: Name of a previously defined remote element.
183If not supplied the remote given by the default element is used. 176If not supplied the remote given by the default element is used.
@@ -197,8 +190,6 @@ its name:`name` and path:`path`. E.g. for
197definition is implicitly in the following manifest groups: 190definition is implicitly in the following manifest groups:
198default, name:monkeys, and path:barrel-of. If you place a project in the 191default, name:monkeys, and path:barrel-of. If you place a project in the
199group "notdefault", it will not be automatically downloaded by repo. 192group "notdefault", it will not be automatically downloaded by repo.
200If the project has a parent element, the `name` and `path` here
201are the prefixed ones.
202 193
203Element annotation 194Element annotation
204------------------ 195------------------