1 .\" Copyright (c) 2003,2004 The DragonFly Project. All rights reserved.
3 .\" This code is derived from software contributed to The DragonFly Project
4 .\" by Matthew Dillon <dillon@backplane.com>
6 .\" Redistribution and use in source and binary forms, with or without
7 .\" modification, are permitted provided that the following conditions
10 .\" 1. Redistributions of source code must retain the above copyright
11 .\" notice, this list of conditions and the following disclaimer.
12 .\" 2. Redistributions in binary form must reproduce the above copyright
13 .\" notice, this list of conditions and the following disclaimer in
14 .\" the documentation and/or other materials provided with the
16 .\" 3. Neither the name of The DragonFly Project nor the names of its
17 .\" contributors may be used to endorse or promote products derived
18 .\" from this software without specific, prior written permission.
20 .\" THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
21 .\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
22 .\" LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
23 .\" FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
24 .\" COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
25 .\" INCIDENTAL, SPECIAL, EXEMPLARY OR CONSEQUENTIAL DAMAGES (INCLUDING,
26 .\" BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
27 .\" LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
28 .\" AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
29 .\" OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
30 .\" OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
38 .Nd instructions and rules for DragonFly committers
42 on how to pull a fresh copy of the
47 Committers have to push to
48 .Pa crater.dragonflybsd.org
51 If the system is set up to pull from a
53 mirror, a remote entry will have to be set up:
54 .Bd -literal -offset indent
55 git remote add crater \\
56 ssh://crater.dragonflybsd.org/repository/git/dragonfly.git
61 should contain at least:
62 .Bd -literal -offset indent
65 email = <login>@dragonflybsd.org
68 Alternatively, see the
75 The git repository machine is
76 .Pa crater.dragonflybsd.org ,
80 .Pa leaf.dragonflybsd.org .
82 an account for you on both machines and install your public SSH
83 key to give you access.
87 account is set up for repository access only.
88 It can only operate as a git slave and cannot be logged into.
90 .Pa crater.dragonflybsd.org
91 is only used as part of
97 account is a general developer account.
102 account, whether a committer or not.
103 It can be useful as a developer rendezvous,
105 For example, people upload kernel cores to
108 developers can look at them.
112 .Bd -literal -offset indent
113 ssh you@leaf.dragonflybsd.org
116 The rules for account use are in
119 It is very important that you never install a password or create a SSH
122 to use to access other machines.
123 Because non-committers can have
127 is not considered a secure machine.
128 .Sh TESTING COMMIT ACCESS
129 There is a directory called
130 .Pa /usr/src/test/test .
132 access, try making a modification and committing a file in this
134 Try to push the commit to
137 .Bd -literal -offset indent
138 cd /usr/src/test/test
140 git commit file_you_edited
143 .Sh COMMITTING REAL WORK
144 Make modifications as needed.
145 For example, edit files.
146 Files and directories can just be added locally.
147 They are stored in your local copy of the repository and then
152 When adding new files make git aware of them like this:
153 .Bd -literal -offset indent
158 To actually push your changes to the repository on
161 .Bd -literal -offset indent
165 To merge bug fixes to other branches (MFC), use
166 .Nm git Cm cherry-pick :
167 .Bd -literal -offset indent
168 git checkout -b rel2_2 crater/DragonFly_RELEASE_2_2
169 git cherry-pick <commit>
170 git push crater rel2_2:DragonFly_RELEASE_2_2
173 Do not set the default remote tag to
178 This reduces instances where accidental commits or repository
179 operations are made on the master repository.
181 It is recommended to enable the MFC-detection commit hook, so that
182 you are reminded of MFCing in case certain keywords are detected in
183 the commit message. To do so, copy the hook into place:
184 .Bd -literal -offset indent
185 cp /usr/src/tools/commit-msg /usr/src/.git/hooks/commit-msg
187 .Sh STRUCTURE OF COMMIT MESSAGES
190 tools display the first line of a commit message as a summary,
191 structure your commit messages like this, if possible:
192 .Bd -literal -offset indent
193 One line summary of your change (less than 50 characters).
195 Maybe more text here describing your changes in detail (including
196 issue tracker IDs etc).
199 To customize the commit template for
202 .Bd -literal -offset indent
203 git config --add commit.template /usr/src/tools/gittemplate
205 .Sh DISCUSSING COMMITTABLE WORK BEFOREHAND
206 Discussion prior to committing usually occurs on the
211 mailing lists and depends on the work involved.
212 Simple and obvious work such as documentation edits or additions
213 doesn't really need a heads up.
215 Simple and obvious bug fixes don't need a heads up either, other than to
216 say that you will (or just have) committed the fix, so you don't
217 race other committers trying to do the same thing.
218 Usually the developer most active in a discussion about a bug commits the
219 fix, but it isn't considered a big deal.
221 More complex issues are usually discussed on the lists first.
222 Non-trivial but straight forward bug fixes usually go through
223 a testing period, where you say something like:
226 to driver BLAH that fixes A, B, and C, please test it.
227 If there are no objections I will commit it next Tuesday.
230 or more depending on the complexity of the patch).
232 New drivers or utilities are usually discussed.
233 Committers will often commit new work
235 hooking it into the buildworld or
236 buildkernel infrastructure in order to be able to continue
237 development on it in piecemeal without having to worry about it
238 breaking buildworld or buildkernel, and then they hook it in as a
239 last step after they've stabilized it.
240 Examples of this include
241 new versions of GCC, updates to vendor packages such as bind,
244 Areas within the repository do not
247 Often situations will arise where one developer commits work and
248 another developer finds an issue with it that needs to be corrected.
250 All committed work becomes community property.
253 on any part of the source tree.
254 However, if a developer is
255 actively working on a portion of the source tree and you find a bug
256 or other issue, courtesy dictates that you post to
258 and/or email the developer.
260 This means that, generally, if you do not see a commit to an area
261 of the source tree in the last few weeks, it isn't considered active and
262 you don't really need to confer with the developer that made the
263 commit, though you should still post to the
265 mailing list and, of course, confer with developers when their expertise
268 One exception to this rule is documentation.
269 If any developer commits
270 new work, the documentation guys have free reign to go in and correct
273 This is really a convenience as most developers are not
275 gurus and it's a waste of time for the doc guys to post to
277 for all the little corrections they make.
279 On the occasion that a major code conflict occurs, for example if two
280 people are doing major work in the same area of the source tree and forgot
281 to collaborate with each other, the project leader will be responsible for
282 resolving the conflict.
283 Again, the repository is considered community
284 property and it must be acceptable for any developer to be able to work on
285 any area of the tree that he or she has an interest in.
286 .Sh MAJOR ARCHITECTURAL CHANGES
290 All major architectural changes must be discussed on the
292 mailing list and he retains veto power.
294 This isn't usually an issue with any work.
296 doesn't look right architecturally he'll chip in with adjustments to
298 Nothing ever really gets vetoed.
300 .Xr git 1 Pq Pa devel/git ,