4 Consistent formatting of this file is achieved with:
5 perl ./Porting/podtidy pod/perlgit.pod
9 perlgit - Detailed information about git and the Perl repository
13 This document provides details on using git to develop Perl. If you are
14 just interested in working on a quick patch, see L<perlhack> first.
15 This document is intended for people who are regular contributors to
16 Perl, including those with write access to the git repository.
18 =head1 CLONING THE REPOSITORY
20 All of Perl's source code is kept centrally in a Git repository at
21 I<perl5.git.perl.org>.
23 You can make a read-only clone of the repository by running:
25 % git clone git://perl5.git.perl.org/perl.git perl
27 This uses the git protocol (port 9418).
29 If you cannot use the git protocol for firewall reasons, you can also
30 clone via http, though this is much slower:
32 % git clone http://perl5.git.perl.org/perl.git perl
34 =head1 WORKING WITH THE REPOSITORY
36 Once you have changed into the repository directory, you can inspect
37 it. After a clone the repository will contain a single local branch,
38 which will be the current branch as well, as indicated by the asterisk.
43 Using the -a switch to C<branch> will also show the remote tracking
44 branches in the repository:
52 The branches that begin with "origin" correspond to the "git remote"
53 that you cloned from (which is named "origin"). Each branch on the
54 remote will be exactly tracked by these branches. You should NEVER do
55 work on these remote tracking branches. You only ever do work in a
56 local branch. Local branches can be configured to automerge (on pull)
57 from a designated remote tracking branch. This is the case with the
58 default branch C<blead> which will be configured to merge from the
59 remote tracking branch C<origin/blead>.
61 You can see recent commits:
65 And pull new changes from the repository, and update your local
66 repository (must be clean first)
70 Assuming we are on the branch C<blead> immediately after a pull, this
71 command would be more or less equivalent to:
74 % git merge origin/blead
76 In fact if you want to update your local repository without touching
77 your working directory you do:
81 And if you want to update your remote-tracking branches for all defined
82 remotes simultaneously you can do
86 Neither of these last two commands will update your working directory,
87 however both will update the remote-tracking branches in your
90 To make a local branch of a remote branch:
92 % git checkout -b maint-5.10 origin/maint-5.10
94 To switch back to blead:
98 =head2 Finding out your status
100 The most common git command you will use will probably be
104 This command will produce as output a description of the current state
105 of the repository, including modified files and unignored untracked
106 files, and in addition it will show things like what files have been
107 staged for the next commit, and usually some useful information about
108 how to change things. For instance the following:
112 # Your branch is ahead of 'origin/blead' by 1 commit.
114 # Changes to be committed:
115 # (use "git reset HEAD <file>..." to unstage)
117 # modified: pod/perlgit.pod
119 # Changed but not updated:
120 # (use "git add <file>..." to update what will be committed)
122 # modified: pod/perlgit.pod
125 # (use "git add <file>..." to include in what will be committed)
127 # deliberate.untracked
129 This shows that there were changes to this document staged for commit,
130 and that there were further changes in the working directory not yet
131 staged. It also shows that there was an untracked file in the working
132 directory, and as you can see shows how to change all of this. It also
133 shows that there is one commit on the working branch C<blead> which has
134 not been pushed to the C<origin> remote yet. B<NOTE>: that this output
135 is also what you see as a template if you do not provide a message to
138 =head2 Patch workflow
140 First, please read L<perlhack> for details on hacking the Perl core.
141 That document covers many details on how to create a good patch.
143 If you already have a Perl repository, you should ensure that you're on
144 the I<blead> branch, and your repository is up to date:
149 It's preferable to patch against the latest blead version, since this
150 is where new development occurs for all changes other than critical bug
151 fixes. Critical bug fix patches should be made against the relevant
152 maint branches, or should be submitted with a note indicating all the
153 branches where the fix should be applied.
155 Now that we have everything up to date, we need to create a temporary
156 new branch for these changes and switch into it:
158 % git checkout -b orange
160 which is the short form of
163 % git checkout orange
165 Creating a topic branch makes it easier for the maintainers to rebase
166 or merge back into the master blead for a more linear history. If you
167 don't work on a topic branch the maintainer has to manually cherry pick
168 your changes onto blead before they can be applied.
170 That'll get you scolded on perl5-porters, so don't do that. Be Awesome.
172 Then make your changes. For example, if Leon Brocard changes his name
173 to Orange Brocard, we should change his name in the AUTHORS file:
175 % perl -pi -e 's{Leon Brocard}{Orange Brocard}' AUTHORS
177 You can see what files are changed:
181 # Changes to be committed:
182 # (use "git reset HEAD <file>..." to unstage)
187 And you can see the changes:
190 diff --git a/AUTHORS b/AUTHORS
191 index 293dd70..722c93e 100644
194 @@ -541,7 +541,7 @@ Lars Hecking <lhecking@nmrc.ucc.ie>
195 Laszlo Molnar <laszlo.molnar@eth.ericsson.se>
196 Leif Huhn <leif@hale.dkstat.com>
197 Len Johnson <lenjay@ibm.net>
198 -Leon Brocard <acme@astray.com>
199 +Orange Brocard <acme@astray.com>
200 Les Peters <lpeters@aol.net>
201 Lesley Binks <lesley.binks@gmail.com>
202 Lincoln D. Stein <lstein@cshl.org>
204 Now commit your change locally:
206 % git commit -a -m 'Rename Leon Brocard to Orange Brocard'
207 Created commit 6196c1d: Rename Leon Brocard to Orange Brocard
208 1 files changed, 1 insertions(+), 1 deletions(-)
210 The C<-a> option is used to include all files that git tracks that you
211 have changed. If at this time, you only want to commit some of the
212 files you have worked on, you can omit the C<-a> and use the command
213 C<S<git add I<FILE ...>>> before doing the commit. C<S<git add
214 --interactive>> allows you to even just commit portions of files
215 instead of all the changes in them.
217 The C<-m> option is used to specify the commit message. If you omit it,
218 git will open a text editor for you to compose the message
219 interactively. This is useful when the changes are more complex than
220 the sample given here, and, depending on the editor, to know that the
221 first line of the commit message doesn't exceed the 50 character legal
224 Once you've finished writing your commit message and exited your
225 editor, git will write your change to disk and tell you something like
228 Created commit daf8e63: explain git status and stuff about remotes
229 1 files changed, 83 insertions(+), 3 deletions(-)
231 If you re-run C<git status>, you should see something like this:
235 # Your branch is ahead of 'origin/blead' by 2 commits.
238 # (use "git add <file>..." to include in what will be committed)
240 # deliberate.untracked
241 nothing added to commit but untracked files present (use "git add" to track)
243 When in doubt, before you do anything else, check your status and read
244 it carefully, many questions are answered directly by the git status
247 You can examine your last commit with:
251 and if you are not happy with either the description or the patch
252 itself you can fix it up by editing the files once more and then issue:
254 % git commit -a --amend
256 Now you should create a patch file for all your local changes:
258 % git format-patch -M blead..
259 0001-Rename-Leon-Brocard-to-Orange-Brocard.patch
261 Or for a lot of changes, e.g. from a topic branch:
263 % git format-patch --stdout -M blead.. > topic-branch-changes.patch
265 You should now send an email to
266 L<perlbug@perl.org|mailto:perlbug@perl.org> with a description of your
267 changes, and include this patch file as an attachment. In addition to
268 being tracked by RT, mail to perlbug will automatically be forwarded to
269 perl5-porters (with manual moderation, so please be patient). You
270 should only send patches to
271 L<perl5-porters@perl.org|mailto:perl5-porters@perl.org> directly if the
272 patch is not ready to be applied, but intended for discussion.
274 Please do not use git-send-email(1) to send your patch. See L<Sending
275 patch emails|/Sending patch emails> for more information.
277 If you want to delete your temporary branch, you may do so with:
280 % git branch -d orange
281 error: The branch 'orange' is not an ancestor of your current HEAD.
282 If you are sure you want to delete it, run 'git branch -D orange'.
283 % git branch -D orange
284 Deleted branch orange.
286 =head2 Committing your changes
288 Assuming that you'd like to commit all the changes you've made as a
289 single atomic unit, run this command:
293 (That C<-a> tells git to add every file you've changed to this commit.
294 New files aren't automatically added to your commit when you use
295 C<commit -a> If you want to add files or to commit some, but not all of
296 your changes, have a look at the documentation for C<git add>.)
298 Git will start up your favorite text editor, so that you can craft a
299 commit message for your change. See L<perlhack/Commit message> for more
300 information about what makes a good commit message.
302 Once you've finished writing your commit message and exited your
303 editor, git will write your change to disk and tell you something like
306 Created commit daf8e63: explain git status and stuff about remotes
307 1 files changed, 83 insertions(+), 3 deletions(-)
309 If you re-run C<git status>, you should see something like this:
313 # Your branch is ahead of 'origin/blead' by 2 commits.
316 # (use "git add <file>..." to include in what will be committed)
318 # deliberate.untracked
319 nothing added to commit but untracked files present (use "git add" to track)
321 When in doubt, before you do anything else, check your status and read
322 it carefully, many questions are answered directly by the git status
325 =head2 Sending patch emails
327 After you've generated your patch you should sent it
328 to perlbug@perl.org (as discussed L<in the previous
329 section|/"Patch workflow">) with a normal mail client as an
330 attachment, along with a description of the patch.
332 You B<must not> use git-send-email(1) to send patches generated with
333 git-format-patch(1). The RT ticketing system living behind
334 perlbug@perl.org does not respect the inline contents of E-Mails,
335 sending an inline patch to RT guarantees that your patch will be
338 Someone may download your patch from RT, which will result in the
339 subject (the first line of the commit message) being omitted. See RT
340 #74192 and commit a4583001 for an example. Alternatively someone may
341 apply your patch from RT after it arrived in their mailbox, by which
342 time RT will have modified the inline content of the message. See RT
343 #74532 and commit f9bcfeac for a bad example of this failure mode.
345 =head2 A note on derived files
347 Be aware that many files in the distribution are derivative--avoid
348 patching them, because git won't see the changes to them, and the build
349 process will overwrite them. Patch the originals instead. Most
350 utilities (like perldoc) are in this category, i.e. patch
351 F<utils/perldoc.PL> rather than F<utils/perldoc>. Similarly, don't
352 create patches for files under $src_root/ext from their copies found in
353 $install_root/lib. If you are unsure about the proper location of a
354 file that may have gotten copied while building the source
355 distribution, consult the C<MANIFEST>.
357 =head2 Cleaning a working directory
359 The command C<git clean> can with varying arguments be used as a
360 replacement for C<make clean>.
362 To reset your working directory to a pristine condition you can do:
366 However, be aware this will delete ALL untracked content. You can use
370 to remove all ignored untracked files, such as build and test
371 byproduct, but leave any manually created files alone.
373 If you only want to cancel some uncommitted edits, you can use C<git
374 checkout> and give it a list of files to be reverted, or C<git checkout
375 -f> to revert them all.
377 If you want to cancel one or several commits, you can use C<git reset>.
381 C<git> provides a built-in way to determine which commit should be blamed
382 for introducing a given bug. C<git bisect> performs a binary search of
383 history to locate the first failing commit. It is fast, powerful and
384 flexible, but requires some setup and to automate the process an auxiliary
385 shell script is needed.
387 The core provides a wrapper program, F<Porting/bisect.pl>, which attempts to
388 simplify as much as possible, making bisecting as simple as running a Perl
389 one-liner. For example, if you want to know when this became an error:
395 .../Porting/bisect.pl -e 'my $a := 2;'
397 Using C<bisect.pl>, with one command (and no other files) it's easy to find
404 Which commit caused this example code to break?
408 Which commit caused this example code to start working?
412 Which commit added the first file to match this regex?
416 Which commit removed the last file to match this regex?
420 usually without needing to know which versions of perl to use as start and
421 end revisions, as F<bisect.pl> automatically searches to find the earliest
422 stable version for which the test case passes. Run
423 C<Porting/bisect.pl --help> for the full documentation, including how to
424 set the C<Configure> and build time options.
426 If you require more flexibility than F<Porting/bisect.pl> has to offer, you'll
427 need to run C<git bisect> yourself. It's most useful to use C<git bisect run>
428 to automate the building and testing of perl revisions. For this you'll need
429 a shell script for C<git> to call to test a particular revision. An example
430 script is F<Porting/bisect-example.sh>, which you should copy B<outside> of
431 the repository, as the bisect process will reset the state to a clean checkout
432 as it runs. The instructions below assume that you copied it as F<~/run> and
433 then edited it as appropriate.
435 You first enter in bisect mode with:
439 For example, if the bug is present on C<HEAD> but wasn't in 5.10.0,
440 C<git> will learn about this when you enter:
443 % git bisect good perl-5.10.0
444 Bisecting: 853 revisions left to test after this
446 This results in checking out the median commit between C<HEAD> and
447 C<perl-5.10.0>. You can then run the bisecting process with:
449 % git bisect run ~/run
451 When the first bad commit is isolated, C<git bisect> will tell you so:
453 ca4cfd28534303b82a216cfe83a1c80cbc3b9dc5 is first bad commit
454 commit ca4cfd28534303b82a216cfe83a1c80cbc3b9dc5
455 Author: Dave Mitchell <davem@fdisolutions.com>
456 Date: Sat Feb 9 14:56:23 2008 +0000
458 [perl #49472] Attributes + Unknown Error
463 You can peek into the bisecting process with C<git bisect log> and
464 C<git bisect visualize>. C<git bisect reset> will get you out of bisect
467 Please note that the first C<good> state must be an ancestor of the
468 first C<bad> state. If you want to search for the commit that I<solved>
469 some bug, you have to negate your test case (i.e. exit with C<1> if OK
470 and C<0> if not) and still mark the lower bound as C<good> and the
471 upper as C<bad>. The "first bad commit" has then to be understood as
472 the "first commit where the bug is solved".
474 C<git help bisect> has much more information on how you can tweak your
477 =head2 Topic branches and rewriting history
479 Individual committers should create topic branches under
480 B<yourname>/B<some_descriptive_name>:
482 $ branch="$yourname/$some_descriptive_name"
483 $ git checkout -b $branch
484 ... do local edits, commits etc ...
485 $ git push origin -u $branch
487 Should you be stuck with an ancient version of git (prior to 1.7), then
488 C<git push> will not have the C<-u> switch, and you have to replace the
489 last step with the following sequence:
491 $ git push origin $branch:refs/heads/$branch
492 $ git config branch.$branch.remote origin
493 $ git config branch.$branch.merge refs/heads/$branch
495 If you want to make changes to someone else's topic branch, you should
496 check with its creator before making any change to it.
499 might sometimes find that the original author has edited the branch's
500 history. There are lots of good reasons for this. Sometimes, an author
501 might simply be rebasing the branch onto a newer source point.
502 Sometimes, an author might have found an error in an early commit which
503 they wanted to fix before merging the branch to blead.
505 Currently the master repository is configured to forbid
506 non-fast-forward merges. This means that the branches within can not be
507 rebased and pushed as a single step.
509 The only way you will ever be allowed to rebase or modify the history
510 of a pushed branch is to delete it and push it as a new branch under
511 the same name. Please think carefully about doing this. It may be
512 better to sequentially rename your branches so that it is easier for
513 others working with you to cherry-pick their local changes onto the new
514 version. (XXX: needs explanation).
516 If you want to rebase a personal topic branch, you will have to delete
517 your existing topic branch and push as a new version of it. You can do
518 this via the following formula (see the explanation about C<refspec>'s
519 in the git push documentation for details) after you have rebased your
523 $ git checkout $user/$topic
525 $ git rebase origin/blead
527 # then "delete-and-push"
528 $ git push origin :$user/$topic
529 $ git push origin $user/$topic
531 B<NOTE:> it is forbidden at the repository level to delete any of the
532 "primary" branches. That is any branch matching
533 C<m!^(blead|maint|perl)!>. Any attempt to do so will result in git
534 producing an error like this:
536 $ git push origin :blead
537 *** It is forbidden to delete blead/maint branches in this repository
538 error: hooks/update exited with error code 1
539 error: hook declined to update refs/heads/blead
540 To ssh://perl5.git.perl.org/perl
541 ! [remote rejected] blead (hook declined)
542 error: failed to push some refs to 'ssh://perl5.git.perl.org/perl'
544 As a matter of policy we do B<not> edit the history of the blead and
545 maint-* branches. If a typo (or worse) sneaks into a commit to blead or
546 maint-*, we'll fix it in another commit. The only types of updates
547 allowed on these branches are "fast-forwards", where all history is
550 Annotated tags in the canonical perl.git repository will never be
551 deleted or modified. Think long and hard about whether you want to push
552 a local tag to perl.git before doing so. (Pushing simple tags is
557 The perl history contains one mistake which was not caught in the
558 conversion: a merge was recorded in the history between blead and
559 maint-5.10 where no merge actually occurred. Due to the nature of git,
560 this is now impossible to fix in the public repository. You can remove
561 this mis-merge locally by adding the following line to your
562 C<.git/info/grafts> file:
564 296f12bbbbaa06de9be9d09d3dcf8f4528898a49 434946e0cb7a32589ed92d18008aaa1d88515930
566 It is particularly important to have this graft line if any bisecting
567 is done in the area of the "merge" in question.
569 =head1 WRITE ACCESS TO THE GIT REPOSITORY
571 Once you have write access, you will need to modify the URL for the
572 origin remote to enable pushing. Edit F<.git/config> with the
573 git-config(1) command:
575 % git config remote.origin.url ssh://perl5.git.perl.org/perl.git
577 You can also set up your user name and e-mail address. Most people do
578 this once globally in their F<~/.gitconfig> by doing something like:
580 % git config --global user.name "Ævar Arnfjörð Bjarmason"
581 % git config --global user.email avarab@gmail.com
583 However, if you'd like to override that just for perl,
584 execute something like the following in F<perl>:
586 % git config user.email avar@cpan.org
588 It is also possible to keep C<origin> as a git remote, and add a new
589 remote for ssh access:
591 % git remote add camel perl5.git.perl.org:/perl.git
593 This allows you to update your local repository by pulling from
594 C<origin>, which is faster and doesn't require you to authenticate, and
595 to push your changes back with the C<camel> remote:
600 The C<fetch> command just updates the C<camel> refs, as the objects
601 themselves should have been fetched when pulling from C<origin>.
603 =head2 Accepting a patch
605 If you have received a patch file generated using the above section,
606 you should try out the patch.
608 First we need to create a temporary new branch for these changes and
611 % git checkout -b experimental
613 Patches that were formatted by C<git format-patch> are applied with
616 % git am 0001-Rename-Leon-Brocard-to-Orange-Brocard.patch
617 Applying Rename Leon Brocard to Orange Brocard
619 If just a raw diff is provided, it is also possible use this two-step
622 % git apply bugfix.diff
623 % git commit -a -m "Some fixing" --author="That Guy <that.guy@internets.com>"
625 Now we can inspect the change:
628 commit b1b3dab48344cff6de4087efca3dbd63548ab5e2
629 Author: Leon Brocard <acme@astray.com>
630 Date: Fri Dec 19 17:02:59 2008 +0000
632 Rename Leon Brocard to Orange Brocard
634 diff --git a/AUTHORS b/AUTHORS
635 index 293dd70..722c93e 100644
638 @@ -541,7 +541,7 @@ Lars Hecking <lhecking@nmrc.ucc.ie>
639 Laszlo Molnar <laszlo.molnar@eth.ericsson.se>
640 Leif Huhn <leif@hale.dkstat.com>
641 Len Johnson <lenjay@ibm.net>
642 -Leon Brocard <acme@astray.com>
643 +Orange Brocard <acme@astray.com>
644 Les Peters <lpeters@aol.net>
645 Lesley Binks <lesley.binks@gmail.com>
646 Lincoln D. Stein <lstein@cshl.org>
648 If you are a committer to Perl and you think the patch is good, you can
649 then merge it into blead then push it out to the main repository:
652 % git merge experimental
653 % git push origin blead
655 If you want to delete your temporary branch, you may do so with:
658 % git branch -d experimental
659 error: The branch 'experimental' is not an ancestor of your current HEAD.
660 If you are sure you want to delete it, run 'git branch -D experimental'.
661 % git branch -D experimental
662 Deleted branch experimental.
664 =head2 Committing to blead
666 The 'blead' branch will become the next production release of Perl.
668 Before pushing I<any> local change to blead, it's incredibly important
669 that you do a few things, lest other committers come after you with
670 pitchforks and torches:
676 Make sure you have a good commit message. See L<perlhack/Commit
677 message> for details.
681 Run the test suite. You might not think that one typo fix would break a
682 test file. You'd be wrong. Here's an example of where not running the
683 suite caused problems. A patch was submitted that added a couple of
684 tests to an existing .t. It couldn't possibly affect anything else, so
685 no need to test beyond the single affected .t, right? But, the
686 submitter's email address had changed since the last of their
687 submissions, and this caused other tests to fail. Running the test
688 target given in the next item would have caught this problem.
692 If you don't run the full test suite, at least C<make test_porting>.
693 This will run basic sanity checks. To see which sanity checks, have a
694 look in F<t/porting>.
698 If you make any changes that affect miniperl or core routines that have
699 different code paths for miniperl, be sure to run C<make minitest>.
700 This will catch problems that even the full test suite will not catch
701 because it runs a subset of tests under miniperl rather than perl.
705 =head2 On merging and rebasing
707 Simple, one-off commits pushed to the 'blead' branch should be simple
708 commits that apply cleanly. In other words, you should make sure your
709 work is committed against the current position of blead, so that you can
710 push back to the master repository without merging.
712 Sometimes, blead will move while you're building or testing your
713 changes. When this happens, your push will be rejected with a message
716 To ssh://perl5.git.perl.org/perl.git
717 ! [rejected] blead -> blead (non-fast-forward)
718 error: failed to push some refs to 'ssh://perl5.git.perl.org/perl.git'
719 To prevent you from losing history, non-fast-forward updates were rejected
720 Merge the remote changes (e.g. 'git pull') before pushing again. See the
721 'Note about fast-forwards' section of 'git push --help' for details.
723 When this happens, you can just I<rebase> your work against the new
724 position of blead, like this (assuming your remote for the master
725 repository is "p5p"):
728 $ git rebase p5p/blead
730 You will see your commits being re-applied, and you will then be able to
731 push safely. More information about rebasing can be found in the
732 documentation for the git-rebase(1) command.
734 For larger sets of commits that only make sense together, or that would
735 benefit from a summary of the set's purpose, you should use a merge
736 commit. You should perform your work on a L<topic branch|/Topic
737 branches and rewriting history>, which you should regularly rebase
738 against blead to ensure that your code is not broken by blead moving.
739 When you have finished your work, please perform a final rebase and
740 test. Linear history is something that gets lost with every
741 commit on blead, but a final rebase makes the history linear
742 again, making it easier for future maintainers to see what has
743 happened. Rebase as follows (assuming your work was on the
744 branch C<< committer/somework >>):
746 $ git checkout committer/somework
749 Then you can merge it into master like this:
752 $ git merge --no-ff --no-commit committer/somework
755 The switches above deserve explanation. C<--no-ff> indicates that even
756 if all your work can be applied linearly against blead, a merge commit
757 should still be prepared. This ensures that all your work will be shown
758 as a side branch, with all its commits merged into the mainstream blead
761 C<--no-commit> means that the merge commit will be I<prepared> but not
762 I<committed>. The commit is then actually performed when you run the
763 next command, which will bring up your editor to describe the commit.
764 Without C<--no-commit>, the commit would be made with nearly no useful
765 message, which would greatly diminish the value of the merge commit as a
766 placeholder for the work's description.
768 When describing the merge commit, explain the purpose of the branch, and
769 keep in mind that this description will probably be used by the
770 eventual release engineer when reviewing the next perldelta document.
772 =head2 Committing to maintenance versions
774 Maintenance versions should only be altered to add critical bug fixes,
777 To commit to a maintenance version of perl, you need to create a local
780 % git checkout --track -b maint-5.005 origin/maint-5.005
782 This creates a local branch named C<maint-5.005>, which tracks the
783 remote branch C<origin/maint-5.005>. Then you can pull, commit, merge
786 You can also cherry-pick commits from blead and another branch, by
787 using the C<git cherry-pick> command. It is recommended to use the
788 B<-x> option to C<git cherry-pick> in order to record the SHA1 of the
789 original commit in the new commit message.
791 Before pushing any change to a maint version, make sure you've
792 satisfied the steps in L</Committing to blead> above.
794 =head2 Merging from a branch via GitHub
796 While we don't encourage the submission of patches via GitHub, that
797 will still happen. Here is a guide to merging patches from a GitHub
800 % git remote add avar git://github.com/avar/perl.git
803 Now you can see the differences between the branch and blead:
805 % git diff avar/orange
807 And you can see the commits:
809 % git log avar/orange
811 If you approve of a specific commit, you can cherry pick it:
813 % git cherry-pick 0c24b290ae02b2ab3304f51d5e11e85eb3659eae
815 Or you could just merge the whole branch if you like it all:
817 % git merge avar/orange
819 And then push back to the repository:
821 % git push origin blead
823 =head2 Using a smoke-me branch to test changes
825 Sometimes a change affects code paths which you cannot test on the OSes
826 which are directly available to you and it would be wise to have users
827 on other OSes test the change before you commit it to blead.
829 Fortunately, there is a way to get your change smoke-tested on various
830 OSes: push it to a "smoke-me" branch and wait for certain automated
831 smoke-testers to report the results from their OSes.
833 The procedure for doing this is roughly as follows (using the example of
834 of tonyc's smoke-me branch called win32stat):
836 First, make a local branch and switch to it:
838 % git checkout -b win32stat
840 Make some changes, build perl and test your changes, then commit them to
841 your local branch. Then push your local branch to a remote smoke-me
844 % git push origin win32stat:smoke-me/tonyc/win32stat
846 Now you can switch back to blead locally:
850 and continue working on other things while you wait a day or two,
851 keeping an eye on the results reported for your smoke-me branch at
852 L<http://perl.develop-help.com/?b=smoke-me/tonyc/win32state>.
854 If all is well then update your blead branch:
858 then checkout your smoke-me branch once more and rebase it on blead:
860 % git rebase blead win32stat
862 Now switch back to blead and merge your smoke-me branch into it:
865 % git merge win32stat
867 As described earlier, if there are many changes on your smoke-me branch
868 then you should prepare a merge commit in which to give an overview of
869 those changes by using the following command instead of the last
872 % git merge win32stat --no-ff --no-commit
874 You should now build perl and test your (merged) changes one last time
875 (ideally run the whole test suite, but failing that at least run the
876 F<t/porting/*.t> tests) before pushing your changes as usual:
878 % git push origin blead
880 Finally, you should then delete the remote smoke-me branch:
882 % git push origin :smoke-me/tonyc/win32stat
884 (which is likely to produce a warning like this, which can be ignored:
886 remote: fatal: ambiguous argument 'refs/heads/smoke-me/tonyc/win32stat':
887 unknown revision or path not in the working tree.
888 remote: Use '--' to separate paths from revisions
890 ) and then delete your local branch:
892 % git branch -d win32stat
894 =head2 A note on camel and dromedary
896 The committers have SSH access to the two servers that serve
897 C<perl5.git.perl.org>. One is C<perl5.git.perl.org> itself (I<camel>),
898 which is the 'master' repository. The second one is
899 C<users.perl5.git.perl.org> (I<dromedary>), which can be used for
900 general testing and development. Dromedary syncs the git tree from
901 camel every few minutes, you should not push there. Both machines also
902 have a full CPAN mirror in /srv/CPAN, please use this. To share files
903 with the general public, dromedary serves your ~/public_html/ as
904 C<http://users.perl5.git.perl.org/~yourlogin/>
906 These hosts have fairly strict firewalls to the outside. Outgoing, only
907 rsync, ssh and git are allowed. For http and ftp, you can use
908 http://webproxy:3128 as proxy. Incoming, the firewall tries to detect
909 attacks and blocks IP addresses with suspicious activity. This
910 sometimes (but very rarely) has false positives and you might get
911 blocked. The quickest way to get unblocked is to notify the admins.
913 These two boxes are owned, hosted, and operated by booking.com. You can
914 reach the sysadmins in #p5p on irc.perl.org or via mail to
915 C<perl5-porters@perl.org>.