Use of Git - Revision history

Jonspillett: Fix link

2017-04-20T01:32:21Z

Fix link

2016-11-06T19:04:46Z

Making pull requests

2016-11-06T19:04:35Z

Making patches

2016-11-06T19:03:43Z

Branches

2016-11-06T19:02:04Z

Pull Requests

2016-11-06T19:01:45Z

Making patches

2015-07-29T22:51:26Z

Pull Requests

2015-07-29T22:50:03Z

Making patches

2015-07-29T20:02:55Z

Making patches

2014-04-26T01:02:58Z

axe todo about Request Tracker; outline of how to contribute mentions that

← Older revision		Revision as of 01:32, 20 April 2017
Line 1:		Line 1:
−	Note: This is a superset of the information at ~~http~~://www.openssl.org/source/~~repos~~.html	+	Note: This is a superset of the information at https://www.openssl.org/source/gitrepo.html

	== Background information about using the Git distributed version control system ==		== Background information about using the Git distributed version control system ==

← Older revision		Revision as of 19:04, 6 November 2016
Line 51:		Line 51:

	After developing and testing changes to OpenSSL in your checkout (clone), push them to your fork of OpenSSL (<tt>git push</tt>), then use the Github interface to submit a pull request to the master OpenSSL repository for the particular revision(s).		After developing and testing changes to OpenSSL in your checkout (clone), push them to your fork of OpenSSL (<tt>git push</tt>), then use the Github interface to submit a pull request to the master OpenSSL repository for the particular revision(s).
		+
		+	Anyone can comment on PR's, and suggest changes. Before a PR is accepted, it must be approved by two OpenSSL team members.

	== Use of Git with the OpenSSL web site ==		== Use of Git with the OpenSSL web site ==

← Older revision		Revision as of 19:04, 6 November 2016
Line 47:		Line 47:

	If you've created your own fork of OpenSSL, replace the URL on the <tt>git clone</tt> command with the one for your fork. Also, you'll need to follow the instructions at https://help.github.com/articles/fork-a-repo for picking up changes from the master repository that you forked.		If you've created your own fork of OpenSSL, replace the URL on the <tt>git clone</tt> command with the one for your fork. Also, you'll need to follow the instructions at https://help.github.com/articles/fork-a-repo for picking up changes from the master repository that you forked.
−
−	~~=== Making patches ===~~
−
−	~~Please use the standard GitHub pull request (PR) mechanism to make patches.~~
−
−	~~Anyone can comment on PR's, and suggest changes. Before a PR is accepted, it must be approved by two OpenSSL team members.~~

	=== Making pull requests ===		=== Making pull requests ===

@@ Line 33: / Line 33: @@
 * master (development)
-* OpenSSL_1_0_2-stable (for the not-yet-released 1.0.2 series)
+* OpenSSL_1_1_0-stable
-* OpenSSL_1_0_1-stable
+* OpenSSL_1_0_2-stable
 In order to access the code for a branch other than master, clone the Git repository then use the <tt>git checkout ''branchname''</tt> command to switch to a different branch.  Consider using separate checkouts for each branch you are working in, with appropriate names for each, such as in the following example.
@@ Line 41: / Line 40: @@
 <pre>
 $ git clone https://github.com/openssl/openssl.git OpenSSL-master
 $ git clone https://github.com/openssl/openssl.git OpenSSL_1_0_2-stable
 $ (cd OpenSSL_1_0_2-stable && git checkout OpenSSL_1_0_2-stable)
 </pre>

← Older revision		Revision as of 19:02, 6 November 2016
Line 54:		Line 54:

	Anyone can comment on PR's, and suggest changes. Before a PR is accepted, it must be approved by two OpenSSL team members.		Anyone can comment on PR's, and suggest changes. Before a PR is accepted, it must be approved by two OpenSSL team members.
−
−	~~=== Pull Requests ===~~
−
−	You can also suggest changes by making pull requests on GitHub. If you do this, please still open a ticket by emailing rt@openssl.org and reference the github pull request number in the description so that we can more easily keep track of it.

	=== Making pull requests ===		=== Making pull requests ===

@@ Line 51: / Line 51: @@
 === Making patches ===
-Patches posted to the [https://www.openssl.org/support/rt.html OpenSSL Request Tracker] should be in Git <tt>format-patch</tt> format if at all practical, since that is easier for OpenSSL committers to apply since it contains author details. All patches sent to the Request Tracker automatically get copied to the openssl-dev@openssl.org email list. Don't send patches direct to this email list - without a ticket in RT it won't get tracked.
+Please use the standard GitHub pull request (PR) mechanism to make patches.
-The [http://git-scm.com/docs/git-format-patch <tt>git format-patch</tt>] documentation describes a lot of options.  Here is an example of the most basic use.
+Anyone can comment on PR's, and suggest changes.  Before a PR is accepted, it must be approved by two OpenSSL team members.
 === Pull Requests ===

@@ Line 157: / Line 157: @@
 === Pull Requests ===
-You can also suggest changes by making pull requests on GitHub.  If you do this, please open a ticket and reference the PR number
+You can also suggest changes by making pull requests on GitHub.  If you do this, please still open a ticket by emailing rt@openssl.org and reference the github pull request number in the description so that we can more easily keep track of it.
 === Making pull requests ===

@@ Line 51: / Line 51: @@
 === Making patches ===
-Patches posted to OpenSSL development mailing lists or to the [https://www.openssl.org/support/rt.html OpenSSL Request Tracker] should be in Git <tt>format-patch</tt> format if at all practical, since that is easier for OpenSSL committers to apply since it contains author details.
+Patches posted to the [https://www.openssl.org/support/rt.html OpenSSL Request Tracker] should be in Git <tt>format-patch</tt> format if at all practical, since that is easier for OpenSSL committers to apply since it contains author details. All patches sent to the Request Tracker automatically get copied to the openssl-dev@openssl.org email list. Don't send patches direct to this email list - without a ticket in RT it won't get tracked.
 The [http://git-scm.com/docs/git-format-patch <tt>git format-patch</tt>] documentation describes a lot of options.  Here is an example of the most basic use.
@@ Line 152: / Line 152: @@
 Double check that only the desired changes are in the patch file.  Otherwise, you probably weren't testing with the most recent OpenSSL changes.
-Open a ticket using the request tracker and attach your patch file.
+Open a ticket using the request tracker (i.e. by sending an email to rt@openssl.org) and attach your patch file.
 If you create your ticket via email, send the patch as an attachment, not as the body of your message.

← Older revision		Revision as of 01:02, 26 April 2014
Line 159:		Line 159:

	After developing and testing changes to OpenSSL in your checkout (clone), push them to your fork of OpenSSL (<tt>git push</tt>), then use the Github interface to submit a pull request to the master OpenSSL repository for the particular revision(s).		After developing and testing changes to OpenSSL in your checkout (clone), push them to your fork of OpenSSL (<tt>git push</tt>), then use the Github interface to submit a pull request to the master OpenSSL repository for the particular revision(s).
−
−	~~(need to allude to other instructions about RT, right?)~~

	== Use of Git with the OpenSSL web site ==		== Use of Git with the OpenSSL web site ==