1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00

Added some new advice on applying patches

This commit is contained in:
Lars Smit 2011-02-28 12:17:26 +01:00 committed by Xavier Noria
parent 67af97c4c1
commit 9b01284c3e

View file

@ -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. 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 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. 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.