diff options
author | Lars Smit <lsmit@digidentity.eu> | 2011-02-28 12:17:26 +0100 |
---|---|---|
committer | Xavier Noria <fxn@hashref.com> | 2011-03-05 11:56:32 +0100 |
commit | 9b01284c3e20bd667a43b3bae48a92c4d280f4fd (patch) | |
tree | 84f139be90139a684c2c287214e48765edd3150b /railties/guides | |
parent | 67af97c4c1561f28801a89a4d2c1c97b419e9fa4 (diff) | |
download | rails-9b01284c3e20bd667a43b3bae48a92c4d280f4fd.tar.gz rails-9b01284c3e20bd667a43b3bae48a92c4d280f4fd.tar.bz2 rails-9b01284c3e20bd667a43b3bae48a92c4d280f4fd.zip |
Added some new advice on applying patches
Diffstat (limited to 'railties/guides')
-rw-r--r-- | railties/guides/source/contributing_to_ruby_on_rails.textile | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/railties/guides/source/contributing_to_ruby_on_rails.textile b/railties/guides/source/contributing_to_ruby_on_rails.textile index e00b26f948..9739da2666 100644 --- a/railties/guides/source/contributing_to_ruby_on_rails.textile +++ b/railties/guides/source/contributing_to_ruby_on_rails.textile @@ -351,6 +351,20 @@ $ git format-patch master --stdout > my_new_patch.diff Sanity check the results of this operation: open the diff file in your text editor of choice and make sure that no unintended changes crept in. +You can check your patches by applying your patch to an different dedicated branch: + +<shell> +$ git checkout -b testing_branch +$ git apply --check my_new_patch.diff +</shell> + +You can make sure your patches don't add any whitespace by applying it yourself using the --whitespace=error-all option. Make sure you are on your dedicated test branche and: + +<shell> +$ git apply --whitespace=error-all mynew_patch.diff +</shell> + + h4. Create a Lighthouse Ticket Now create a ticket with your patch. Go to the "new ticket":http://rails.lighthouseapp.com/projects/8994-ruby-on-rails/tickets/new page at Lighthouse. Fill in a reasonable title and description, remember to attach your patch file, and tag the ticket with the ‘patch’ tag and whatever other subject area tags make sense. |