Creating patches - Revision history

Prabuanand: rewrote for consistency

2025-10-05T19:21:20Z

rewrote for consistency

← Older revision		Revision as of 19:21, 5 October 2025
Line 8:		Line 8:
	* [[Git#Forking a repository\|Fork the aports repository]], if you want to open a merge request for aports.		* [[Git#Forking a repository\|Fork the aports repository]], if you want to open a merge request for aports.
	* After forking, [[Git#Cloning_your_forked_repository\|clone the forked repository]].		* After forking, [[Git#Cloning_your_forked_repository\|clone the forked repository]].
	* [[Git#Change_to_another_branch\|Create and ~~change~~ to a new branch]] e.g. name of the package you want to edit.		* [[Git#Change_to_another_branch\|Create and switch to a new branch]] e.g. name of the package you want to edit.
	* Do all your changes in the above branch and [[Git#Commit\|commit]] your work.		* Do all your changes in the above branch and [[Git#Commit\|commit]] your work.

Prabuanand: rephrased sentence to seperate out the MR process

2025-10-05T18:58:13Z

rephrased sentence to seperate out the MR process

← Older revision		Revision as of 18:58, 5 October 2025
Line 5:		Line 5:
	== Submitting patches via Gitlab ==		== Submitting patches via Gitlab ==

	* [[Git\|Setup gitlab account]] first, if not already done.		* [[Git#Setup gitlab account\|Set up Gitlab account]] first, if not already done.
	* [[Git#Forking a repository\|Fork the aports repository]], if you want to open a merge request for aports.		* [[Git#Forking a repository\|Fork the aports repository]], if you want to open a merge request for aports.
	* After forking [[Git#Cloning_your_forked_repository\|clone the forked repository]].		* After forking, [[Git#Cloning_your_forked_repository\|clone the forked repository]].
			* [[Git#Change_to_another_branch\|Create and change to a new branch]] e.g. name of the package you want to edit.
			* Do all your changes in the above branch and [[Git#Commit\|commit]] your work.

	=== Creating a merge request ===		=== Creating a merge request ===

	* ~~[[Git#Change_to_another_branch\|Change~~ to ~~another branch]] for e.g. the name of the package you want to edit.~~		* To create a Merge Request, push your changes to your fork, as follows:{{Cmd\|git push -u origin $branchname}}
	* Do your ~~changes now and then push with~~:{{Cmd\|git push -u origin $branchname }}		* Gitlab will usually print a URL to create a Merge Request in your terminal.
	* Gitlab will print an URL to create a ~~merge request~~ in your terminal.		* Open that URL in your browser, follow the instructions to complete the Merge Request creation.

	=== Amending changes to a merge request ===		=== Amending changes to a merge request ===

Prabuanand: minor formatting changes

2025-10-05T18:23:02Z

minor formatting changes

← Older revision		Revision as of 18:23, 5 October 2025
Line 4:		Line 4:

	== Submitting patches via Gitlab ==		== Submitting patches via Gitlab ==

			* [[Git\|Setup gitlab account]] first, if not already done.
			* [[Git#Forking a repository\|Fork the aports repository]], if you want to open a merge request for aports.
			* After forking [[Git#Cloning_your_forked_repository\|clone the forked repository]].

	=== Creating a merge request ===		=== Creating a merge request ===
	~~# [[Git\|Setup gitlab account]] first, if not already done.~~
	~~# [[Git#Forking a repository\|Fork the aports repository]], if you want to open a merge request for aports.~~		* [[Git#Change_to_another_branch\|Change to another branch]] for e.g. the name of the package you want to edit.
	~~# After forking [[Git#Cloning_your_forked_repository\|clone the forked repository]].~~		* Do your changes now and then push with:{{Cmd\|git push -u origin $branchname }}
	# [[Git#Change_to_another_branch\|Change to another branch]] for e.g. the name of the package you want to edit.		* Gitlab will print an URL to create a merge request in your terminal.
	# Do your changes now and then push with: {{Cmd\|git push -u origin $branchname }}
	# Gitlab will print an URL to create a merge request in your terminal.

	=== Amending changes to a merge request ===		=== Amending changes to a merge request ===

Prabuanand: minor formatting and removed line already moved to Git page

2025-10-05T18:07:48Z

minor formatting and removed line already moved to Git page

← Older revision		Revision as of 18:07, 5 October 2025
Line 4:		Line 4:

	== Submitting patches via Gitlab ==		== Submitting patches via Gitlab ==


	~~<!-- Need to check and place these content somewhere meaningfull~~
	~~If you already have an old fork, first clone it and then update it as shown below.-->~~

	=== Creating a merge request ===		=== Creating a merge request ===
Line 19:		Line 15:
	=== Amending changes to a merge request ===		=== Amending changes to a merge request ===

	If reviewers requested changes or if you noticed that something should be changed about your merge request's change you can simply amend your changes to the right commit and force push. So if you want to change the commit at the tip of your branch you can simply do:		If reviewers requested changes or if you noticed that something should be changed about your merge request's change you can simply amend your changes to the right commit and force push. So if you want to change the commit at the tip of your branch you can simply do: {{Cmd\|git commit --amend}}

	{{Cmd\|git commit --amend}}

	~~If you want to change a commit that's not at the tip of your branch you can do:~~

	~~{{Cmd\|git commit --fixup $SHA1_OF_COMMIT_YOU_WANT_TO_FIX~~}}

	~~Afterwards~~ you ~~have~~ to ~~force-push in order to update~~ your ~~merge request~~:		If you want to change a commit that's not at the tip of your branch you can do: {{Cmd\|git commit --fixup $SHA1_OF_COMMIT_YOU_WANT_TO_FIX}}

	{{Cmd\|git push -f origin}}		Afterwards you have to force-push in order to update your merge request: {{Cmd\|git push -f origin}}

	== Submitting patches via the mailing list ==		== Submitting patches via the mailing list ==

Prabuanand: this content was already moved to Git#Rebasing_against_upstream_master. removed the wikilink earlier

2025-10-05T18:06:17Z

this content was already moved to Git#Rebasing_against_upstream_master. removed the wikilink earlier

← Older revision		Revision as of 18:06, 5 October 2025
Line 30:		Line 30:

	{{Cmd\|git push -f origin}}		{{Cmd\|git push -f origin}}

	~~=== Rebasing against Alpine Linux's master ===~~

	It's best to always stay up-to-date with the state of the upstream Alpine Linux repository to ensure that no merge conflicts happen later on. To do that you first have to add a new git remote which points to the upstream repository (instead of your fork):

	~~{{Cmd\|git remote add upstream <nowiki>https://gitlab.alpinelinux.org/alpine/$REPO</nowiki>}}~~

	~~Now you can fetch all changes with:~~

	~~{{Cmd\|git fetch --all}}~~

	~~And then you can rebase with:~~

	~~{{Cmd\|git rebase}}~~

	== Submitting patches via the mailing list ==		== Submitting patches via the mailing list ==

Prabuanand: moved most content to appropriate pages like Git

2025-10-05T17:51:25Z

moved most content to appropriate pages like Git

← Older revision		Revision as of 17:51, 5 October 2025
Line 5:		Line 5:
	== Submitting patches via Gitlab ==		== Submitting patches via Gitlab ==

	~~=== Setup ===~~

	~~To submit patches on [https://gitlab.alpinelinux.org Alpine Linux' Gitlab instance]~~ you ~~first~~ have ~~to create~~ an ~~account for~~ it ~~[https://gitlab.alpinelinux.org/users/sign_in here]. It's recommended to set a SSH key now, refer to the [https://docs.gitlab.com/ee/ssh/ Gitlab docs] for how to do that~~.		<!-- Need to check and place these content somewhere meaningfull
			If you already have an old fork, first clone it and then update it as shown below.-->

	=== Creating a merge request ===		=== Creating a merge request ===
			# [[Git\|Setup gitlab account]] first, if not already done.
	~~Now that you're all setup you have to fork~~ the repository ~~you want to contribute to~~, ~~for example~~ if you want to open a merge request for aports ~~you would have to fork [https://gitlab~~.~~alpinelinux.org/alpine/aports alpine/aports], see the [https://docs.gitlab.com/ee/user/project/repository/forking_workflow.html~~#creating-a-fork Gitlab docs] if you're having problems with that. Other repositories belonging to Alpine Linux live in the [https://gitlab.alpinelinux.org/alpine Alpine organisation]. If you already have an old fork, first clone it and then update it as shown below.		# [[Git#Forking a repository\|Fork the aports repository]], if you want to open a merge request for aports.
			# After forking [[Git#Cloning_your_forked_repository\|clone the forked repository]].
	After forking ~~you can~~ clone the repository ~~like so:~~		# [[Git#Change_to_another_branch\|Change to another branch]] for e.g. the name of the package you want to edit.
			# Do your changes now and then push with: {{Cmd\|git push -u origin $branchname }}
	~~{{Cmd~~\|~~git clone git@gitlab.alpinelinux.org:$USER/$REPO.git}}~~		# Gitlab will print an URL to create a merge request in your terminal.

	~~Replace $USER with the nickname of your Gitlab account and $REPO with the repository you want to work on. Now you can change~~ to another branch (e.g. the name of the package you want to edit~~) with:~~

	~~(If necessary, update an old fork first, see [[~~#~~Rebasing against Alpine Linux's master\|rebasing]], below)~~

	~~{{Cmd\|git checkout -b pkgname}}~~

	Do your changes now and then push with:

	{{Cmd\|git push -u origin $branchname }}

	Gitlab will print an URL to create a merge request in your terminal.

	=== Amending changes to a merge request ===		=== Amending changes to a merge request ===

Prabuanand: changed introduction and moved some content to Aports tree

2025-10-05T16:09:04Z

changed introduction and moved some content to Aports tree

← Older revision		Revision as of 16:09, 5 October 2025
Line 1:		Line 1:
	~~New aports should normally go into testing repository. After a reasonable testing period if~~ the ~~package is complete (e~~.g. ~~it has an init script, it has~~ a ~~working and sane default configuration, etc~~.~~) and it has a maintainer it~~ can be ~~moved into community repository~~. ~~Main repository~~ is ~~for packages that are either core~~ of the ~~linux system or are dependencies of other core packages. A package in main cannot have a dependency in community or testing and a package in community cannot have a dependency on packages in testing~~.		This page documents the ways to propose changes to packages in Alpine Linux [https://gitlab.alpinelinux.org/alpine/aports aports] as a patch. Patches can be currently submitted [[#Submitting patches via Gitlab\|via Gitlab]] only. Creating and submitting patches is one of the most effective way to [[Alpine_Linux:Contribute\|contribute]] to Alpine Linux.

	~~There are currently two ways~~ to ~~contribute to propose changes~~, ~~via Gitlab and via the mailing list~~.		If you want to create a new package, refer [[Creating an Alpine package]] page.

	== Submitting patches via Gitlab ==		== Submitting patches via Gitlab ==
Line 58:		Line 58:

	== Submitting patches via the mailing list ==		== Submitting patches via the mailing list ==
	{{Warning\|Submitting patches via the mailing list is currently broken ~~as-of 15 August 2023~~}}
			{{Warning\|Submitting patches via the mailing list is currently broken.}}

	Patches should be created with git and submitted to [mailto:alpine-aports@lists.alpinelinux.org alpine-aports] mailing list with ''git send-email'' (which needs the ''git-email'' Alpine package).		Patches should be created with git and submitted to [mailto:alpine-aports@lists.alpinelinux.org alpine-aports] mailing list with ''git send-email'' (which needs the ''git-email'' Alpine package).

Heurist: /* Resend an updated patch */

2025-07-10T02:23:21Z

Resend an updated patch

← Older revision		Revision as of 02:23, 10 July 2025
Line 116:		Line 116:
	When you sending a second version of the patch use '''--subject-prefix "PATCH v2"''' to indicate that this is a new version of a previously sent patch. You may also use '''--in-reply-to <message-id>''' where <message-id> the the id of email requesting the resend.		When you sending a second version of the patch use '''--subject-prefix "PATCH v2"''' to indicate that this is a new version of a previously sent patch. You may also use '''--in-reply-to <message-id>''' where <message-id> the the id of email requesting the resend.

	You should also write a note on ~~the~~ what was changed. Use '''--annotate''' for this and write the comment under the three dashes "---" so the note is not included in the commit message. For example:		You should also write a note on what was changed. Use '''--annotate''' for this and write the comment under the three dashes "---" so the note is not included in the commit message. For example:
	<pre>		<pre>
	...		...

Prabuanand: Prabuanand moved page Development using git:Creating patches to Creating patches over redirect: Restoring back to the original page

2025-02-17T16:08:06Z

Prabuanand moved page Development using git:Creating patches to Creating patches over redirect: Restoring back to the original page

← Older revision	Revision as of 16:08, 17 February 2025
(No difference)

Prabuanand: Prabuanand moved page Creating patches to Development using git:Creating patches: Moving all alpine Development using git related pages to single page for easier referencing

2024-08-14T10:10:37Z

Prabuanand moved page Creating patches to Development using git:Creating patches: Moving all alpine Development using git related pages to single page for easier referencing

← Older revision	Revision as of 10:10, 14 August 2024
(No difference)

← Older revision		Revision as of 19:21, 5 October 2025
Line 8:		Line 8:
	* [[Git#Forking a repository\|Fork the aports repository]], if you want to open a merge request for aports.		* [[Git#Forking a repository\|Fork the aports repository]], if you want to open a merge request for aports.
	* After forking, [[Git#Cloning_your_forked_repository\|clone the forked repository]].		* After forking, [[Git#Cloning_your_forked_repository\|clone the forked repository]].
	* [[Git#Change_to_another_branch\|Create and ~~change~~ to a new branch]] e.g. name of the package you want to edit.		* [[Git#Change_to_another_branch\|Create and switch to a new branch]] e.g. name of the package you want to edit.
	* Do all your changes in the above branch and [[Git#Commit\|commit]] your work.		* Do all your changes in the above branch and [[Git#Commit\|commit]] your work.