This is a live mirror of the Perl 5 development currently hosted at https://github.com/perl/perl5
Document how commiters can keep 'origin' as a git remote and push with another ssh...
[perl5.git] / pod / perlrepository.pod
CommitLineData
d7dd28b6
LB
1=head1 NAME
2
3perlrepository - Using the Perl source repository
4
5=head1 SYNOPSIS
6
7All of Perl's source code is kept centrally in a Git repository. The
8repository contains many Perl revisions from Perl 1 onwards and all
9the revisions from Perforce, the version control system we were using
10previously. This repository is accessible in different ways.
11
12The full repository takes up about 80MB of disk space. A check out of
d9847473
RGS
13the blead branch (that is, the master branch, which contains bleadperl,
14the development version of perl 5) takes up about 160MB of disk space
15(including the repository). A build of bleadperl takes up about 200MB
16(including the repository and the check out).
d7dd28b6
LB
17
18=head1 GETTING ACCESS TO THE REPOSITORY
19
20=head2 READ ACCESS VIA THE WEB
21
22You may access this over the web. This allows you to browse the tree,
23see recent commits, search for particular commits and more. You may
24access it at:
25
26 http://perl5.git.perl.org/perl.git
27
28=head2 READ ACCESS VIA GIT
29
30You will need a copy of Git for your computer. You can fetch a copy of
31the repository using the Git protocol (which uses port 9418):
32
3b8a5fb0 33 git clone git://perl5.git.perl.org/perl.git perl-git
d7dd28b6 34
3b8a5fb0 35This clones the repository and makes a local copy in the 'perl-git'
d7dd28b6
LB
36directory.
37
38If your local network does not allow you to use port 9418, then you can
572f57ba 39fetch a copy of the repository over HTTP (this is slower):
d7dd28b6 40
3b8a5fb0 41 git clone http://perl5.git.perl.org/perl.git perl-http
d7dd28b6 42
3b8a5fb0 43This clones the repository and makes a local copy in the 'perl-http'
d7dd28b6
LB
44directory.
45
46=head2 WRITE ACCESS TO THE REPOSITORY
47
48If you are a committer, then you can fetch a copy of the repository that
49you can push back on with:
50
3b8a5fb0 51 git clone ssh://perl5.git.perl.org/gitroot/perl.git perl-ssh
d7dd28b6 52
3b8a5fb0 53This clones the repository and makes a local copy in the 'perl-ssh'
d7dd28b6
LB
54directory.
55
1a0f15d5 56If you clone using git, which is faster than ssh, then you will need to
d9847473 57modify your config in order to enable pushing. Edit F<.git/config> where
1a0f15d5
YO
58you will see something like:
59
60 [remote "origin"]
61 url = git://perl5.git.perl.org/perl.git
62
63change that to something like this:
64
65 [remote "origin"]
66 url = ssh://perl5.git.perl.org/gitroot/perl.git
67
68NOTE: there are symlinks set up so that the /gitroot is actually optional.
d7dd28b6 69
184487f0
NC
70You can also set up your user name and e-mail address. For example
71
72 % git config user.name "Leon Brocard"
73 % git config user.email acme@astray.com
74
f6c12373
VP
75It is also possible to keep C<origin> as a git remote, and add a new remote for ssh access:
76
77 % git remote add camel user@camel:/gitroot/perl.git
78
79This allows you to update your local repository by pulling from C<origin>, which is faster and doesn't require you to authentify, and to push your changes back with the C<camel> remote:
80
81 % git fetch camel
82 % git push camel
83
84The C<fetch> command just updates the C<camel> refs, as the objects themselves should have been fetched when pulling from C<origin>.
85
d7dd28b6
LB
86=head1 OVERVIEW OF THE REPOSITORY
87
88Once you have changed into the repository directory, you can inspect it.
89
d7dd28b6 90
39219fd3
YO
91After a clone the repository will contain a single local branch, which
92will be the current branch as well, as indicated by the asterix.
93
94 % git branch
95 * blead
96
d9847473 97Using the -a switch to branch will also show the remote tracking branches in the
39219fd3
YO
98repository:
99
d9847473 100 % git branch -a
09081495 101 * blead
d7dd28b6
LB
102 origin/HEAD
103 origin/blead
104 ...
105
39219fd3 106The branches that begin with "origin" correspond to the "git remote" that
d9847473
RGS
107you cloned from (which is named "origin"). Each branch on the remote will
108be exactly tracked by theses branches. You should NEVER do work on these
109remote tracking branches. You only ever do work in a local branch. Local
110branches can be configured to automerge (on pull) from a designated remote
111tracking branch. This is the case with the default branch C<blead> which
112will be configured to merge from the remote tracking branch
113C<origin/blead>.
39219fd3 114
d7dd28b6
LB
115You can see recent commits:
116
c2cf2042 117 % git log
d7dd28b6 118
23f8d33e 119And pull new changes from the repository, and update your local repository
39219fd3 120(must be clean first)
d7dd28b6
LB
121
122 % git pull
09081495 123
39219fd3
YO
124Assuming we are on the branch C<blead> immediately after a pull, this command
125would be more or less equivalent to:
126
127 % git fetch
128 % git merge origin/blead
129
130In fact if you want to update your local repository without touching your working
131directory you do:
132
133 % git fetch
134
d9847473
RGS
135And if you want to update your remote-tracking branches for all defined remotes
136simultaneously you can do
39219fd3
YO
137
138 % git remote update
139
140Neither of these last two commands will update your working directory, however
d9847473 141both will update the remote-tracking branches in your repository.
39219fd3 142
09081495
LB
143To switch to another branch:
144
145 % git checkout origin/maint-5.8-dor
146
147To switch back to blead:
148
149 % git checkout blead
c2cf2042 150
39219fd3
YO
151=head2 FINDING OUT YOUR STATUS
152
153The most common git command you will use will probably be
154
155 % git status
156
23f8d33e 157This command will produce as output a description of the current state of the
39219fd3 158repository, including modified files and unignored untracked files, and in addition
23f8d33e
YO
159it will show things like what files have been staged for the next commit,
160and usually some useful information about how to change things. For instance the
39219fd3
YO
161following:
162
163 $ git status
164 # On branch blead
165 # Your branch is ahead of 'origin/blead' by 1 commit.
166 #
167 # Changes to be committed:
168 # (use "git reset HEAD <file>..." to unstage)
169 #
170 # modified: pod/perlrepository.pod
171 #
172 # Changed but not updated:
173 # (use "git add <file>..." to update what will be committed)
174 #
175 # modified: pod/perlrepository.pod
176 #
177 # Untracked files:
178 # (use "git add <file>..." to include in what will be committed)
179 #
180 # deliberate.untracked
181
182This shows that there were changes to this document staged for commit, and
183that there were further changes in the working directory not yet staged. It
184also shows that there was an untracked file in the working directory, and as
185you can see shows how to change all of this. It also shows that there
186is one commit on the working branch C<blead> which has not been pushed to the
23f8d33e 187C<origin> remote yet. B<NOTE>: that this output is also what you see as a
d9847473 188template if you do not provide a message to C<git commit>.
7f6effc7
YO
189
190Assuming we commit all the mentioned changes above:
191
192 % git commit -a -m'explain git status and stuff about remotes'
193 Created commit daf8e63: explain git status and stuff about remotes
194 1 files changed, 83 insertions(+), 3 deletions(-)
195
196We can re-run git status and see something like this:
197
198 % git status
199 # On branch blead
200 # Your branch is ahead of 'origin/blead' by 2 commits.
201 #
202 # Untracked files:
203 # (use "git add <file>..." to include in what will be committed)
204 #
205 # deliberate.untracked
206 nothing added to commit but untracked files present (use "git add" to track)
207
39219fd3 208
23f8d33e 209When in doubt, before you do anything else, check your status and read it
39219fd3
YO
210carefully, many questions are answered directly by the git status output.
211
c2cf2042
LB
212=head1 SUBMITTING A PATCH
213
214If you have a patch in mind for Perl, you should first get a copy of
215the repository:
216
217 % git clone git://perl5.git.perl.org/perl.git perl-git
218
219Then change into the directory:
220
221 % cd perl-git
222
12322d22 223Alternatively, if you already have a Perl repository, you should
f5445761 224ensure that you're on the I<blead> branch, and your repository
12322d22
A
225is up to date:
226
227 % git checkout blead
228 % git pull
229
230Now that we have everything up to date, we need to create a temporary new
231branch for these changes and switch into it:
b1fccde5 232
a9b05323 233 % git checkout -b orange
23f8d33e 234
a9b05323
YO
235which is the short form of
236
b1fccde5
LB
237 % git branch orange
238 % git checkout orange
239
c2cf2042
LB
240Then make your changes. For example, if Leon Brocard changes his name
241to Orange Brocard, we should change his name in the AUTHORS file:
242
243 % perl -pi -e 's{Leon Brocard}{Orange Brocard}' AUTHORS
244
245You can see what files are changed:
246
247 % git status
248 # On branch blead
249 # Changes to be committed:
250 # (use "git reset HEAD <file>..." to unstage)
251 #
252 # modified: AUTHORS
253 #
254
c2cf2042
LB
255And you can see the changes:
256
257 % git diff
258 diff --git a/AUTHORS b/AUTHORS
259 index 293dd70..722c93e 100644
260 --- a/AUTHORS
261 +++ b/AUTHORS
7df2e4bc 262 @@ -541,7 +541,7 @@ Lars Hecking <lhecking@nmrc.ucc.ie>
c2cf2042
LB
263 Laszlo Molnar <laszlo.molnar@eth.ericsson.se>
264 Leif Huhn <leif@hale.dkstat.com>
265 Len Johnson <lenjay@ibm.net>
266 -Leon Brocard <acme@astray.com>
267 +Orange Brocard <acme@astray.com>
268 Les Peters <lpeters@aol.net>
269 Lesley Binks <lesley.binks@gmail.com>
270 Lincoln D. Stein <lstein@cshl.org>
271
272Now commit your change locally:
273
274 % git add AUTHORS
275 % git commit -m 'Rename Leon Brocard to Orange Brocard'
276 Created commit 6196c1d: Rename Leon Brocard to Orange Brocard
277 1 files changed, 1 insertions(+), 1 deletions(-)
278
279Now you should create a patch file for all your local changes:
280
2af192ee 281 % git format-patch origin
c2cf2042
LB
282 0001-Rename-Leon-Brocard-to-Orange-Brocard.patch
283
284You should now send an email to perl5-porters@perl.org with a
285description of your changes, and attach this patch file as an
286attachment.
287
b1fccde5
LB
288If you want to delete your temporary branch, you may do so with:
289
290 % git checkout blead
291 % git branch -d orange
292 error: The branch 'orange' is not an ancestor of your current HEAD.
293 If you are sure you want to delete it, run 'git branch -D orange'.
294 % git branch -D orange
295 Deleted branch orange.
7df2e4bc
LB
296
297=head1 ACCEPTING A PATCH
298
299If you have received a patch file generated using the above section,
300you should try out the patch.
301
302First we need to create a temporary new branch for these changes and
303switch into it:
304
a9b05323 305 % git checkout -b experimental
7df2e4bc
LB
306
307Now we should apply the patch:
308
2af192ee 309 % git am 0001-Rename-Leon-Brocard-to-Orange-Brocard.patch
7df2e4bc
LB
310 Applying Rename Leon Brocard to Orange Brocard
311
312Now we can inspect the change:
313
314 % git log
315 commit b1b3dab48344cff6de4087efca3dbd63548ab5e2
316 Author: Leon Brocard <acme@astray.com>
317 Date: Fri Dec 19 17:02:59 2008 +0000
318
319 Rename Leon Brocard to Orange Brocard
320 ...
321
322 % git diff blead
323 diff --git a/AUTHORS b/AUTHORS
324 index 293dd70..722c93e 100644
325 --- a/AUTHORS
326 +++ b/AUTHORS
327 @@ -541,7 +541,7 @@ Lars Hecking <lhecking@nmrc.ucc.ie>
328 Laszlo Molnar <laszlo.molnar@eth.ericsson.se>
329 Leif Huhn <leif@hale.dkstat.com>
330 Len Johnson <lenjay@ibm.net>
331 -Leon Brocard <acme@astray.com>
332 +Orange Brocard <acme@astray.com>
333 Les Peters <lpeters@aol.net>
334 Lesley Binks <lesley.binks@gmail.com>
335 Lincoln D. Stein <lstein@cshl.org>
336
337If you are a committer to Perl and you think the patch is good, you can
75fb7651 338then merge it into blead then push it out to the main repository:
7df2e4bc
LB
339
340 % git checkout blead
d9847473 341 % git merge experimental
75fb7651 342 % git push
7df2e4bc
LB
343
344If you want to delete your temporary branch, you may do so with:
345
346 % git checkout blead
347 % git branch -d experimental
348 error: The branch 'experimental' is not an ancestor of your current HEAD.
349 If you are sure you want to delete it, run 'git branch -D experimental'.
350 % git branch -D experimental
351 Deleted branch experimental.
b0d36535
YO
352
353=head1 CLEANING A WORKING DIRECTORY
354
355The command C<git clean> can with varying arguments be used as a replacement for make-clean.
356
357To reset your working directory to a pristine condition you can do:
358
359 git clean -dxf
360
361However, be aware this will delete ALL untracked content. You can use
362
363 git clean -Xf
364
365to remove all ignored untracked files, such as build and test byproduct, but leave any
366manually created files alone.
367