Skip to content

Commit a41a32b

Browse files
Matthew Ogilviegitster
authored andcommitted
Documentation cvs: Clarify when a bare repository is needed
New users sometimes import a project and then immediately try to use the imported repository as a central shared repository. This provides pointers about setting up a bare repository for that in the parts of the documentation dealing with CVS migration. Signed-off-by: Matthew Ogilvie <mmogilvi_git@miniinfo.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 2b2da68 commit a41a32b

File tree

3 files changed

+14
-0
lines changed

3 files changed

+14
-0
lines changed

Documentation/git-cvsimport.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,12 @@ to work with; after that, you need to 'git merge' incremental imports, or
3131
any CVS branches, yourself. It is advisable to specify a named remote via
3232
-r to separate and protect the incoming branches.
3333

34+
If you intend to set up a shared public repository that all developers can
35+
read/write, or if you want to use linkgit:git-cvsserver[1], then you
36+
probably want to make a bare clone of the imported repository,
37+
and use the clone as the shared repository.
38+
See linkgit:gitcvs-migration[7].
39+
3440

3541
OPTIONS
3642
-------

Documentation/git-cvsserver.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,9 @@ write access to the log file and to the database (see
133133
<<dbbackend,Database Backend>>. If you want to offer write access over
134134
SSH, the users of course also need write access to the git repository itself.
135135

136+
You also need to ensure that each repository is "bare" (without a git index
137+
file) for `cvs commit` to work. See linkgit:gitcvs-migration[7].
138+
136139
[[configaccessmethod]]
137140
All configuration variables can also be overridden for a specific method of
138141
access. Valid method names are "ext" (for SSH access) and "pserver". The

Documentation/gitcvs-migration.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,11 @@ work, you must not modify the imported branches; instead, create new
143143
branches for your own changes, and merge in the imported branches as
144144
necessary.
145145

146+
If you want a shared repository, you will need to make a bare clone
147+
of the imported directory, as described above. Then treat the imported
148+
directory as another development clone for purposes of merging
149+
incremental imports.
150+
146151
Advanced Shared Repository Management
147152
-------------------------------------
148153

0 commit comments

Comments
 (0)