Git - Revision history

EPirat: /* Basic Git usage */ Change Git repo URLs to GitLab

2021-06-18T20:12:59Z

Basic Git usage: Change Git repo URLs to GitLab

← Older revision		Revision as of 20:12, 18 June 2021
Line 7:		Line 7:
	=== Getting VLC or x264 source code via Git ===		=== Getting VLC or x264 source code via Git ===

	{{$}} git clone https://~~git~~.videolan.org/~~git~~/vlc.git		{{$}} git clone https://code.videolan.org/videolan/vlc.git
	Voilà! The full VLC history should be on your hard disk in vlc/.		Voilà! The full VLC history should be on your hard disk in vlc/.

	$ git clone https://~~git~~.videolan.org/~~git~~/x264.git		$ git clone https://code.videolan.org/videolan/x264.git
	Voilà! The full x264 history should be on your hard disk in x264/.		Voilà! The full x264 history should be on your hard disk in x264/.

	If you want only the last 3 VLC revisions:		If you want only the last 3 VLC revisions:
	$ git clone https://~~git~~.videolan.org/~~git~~/vlc.git --depth 3		$ git clone https://code.videolan.org/videolan/vlc.git --depth 3

	Clones without the full revision set (--depth) can't be used for backporting (or to make sure that you're including at least commits up to the common fork point).		Clones without the full revision set (--depth) can't be used for backporting (or to make sure that you're including at least commits up to the common fork point).

	You can ~~also have~~ the VLC ~~stable~~ branch, ~~here~~:		You can find the stable VLC version in the 3.0.x branch, to check just that out use:
	$ git clone https://~~git~~.videolan.org/~~git~~/vlc~~/vlc-2.2~~.git
			$ git clone --single-branch --branch 3.0.x https://code.videolan.org/videolan/vlc.git
	Voilà! You got the stable branch repository.		Voilà! You got the stable branch repository.

	See https://~~git~~.videolan.org/~~?p=~~vlc~~.git;a=summary~~		See https://code.videolan.org/videolan/vlc

	Or via http protocol from github (github can sometimes be a bit behind as a mirror):		Or via http protocol from github (github can sometimes be a bit behind as a mirror):
Line 39:		Line 40:
	to see the log graphically.		to see the log graphically.

	You can also browse the sources ~~via~~ [https://~~git~~.videolan.org/ ~~gitweb~~].		You can also browse the sources on [https://code.videolan.org/videolan/vlc GitLab].

	=== Configure your global git config ===		=== Configure your global git config ===

DoesItReallyMatter: /* Documentation about git */ Fix sourcemage.org link

2019-03-11T07:45:13Z

Documentation about git: Fix sourcemage.org link

← Older revision		Revision as of 07:45, 11 March 2019
Line 434:		Line 434:
	* [https://www.kernel.org/pub/software/scm/git/docs/tutorial.html Git Tutorial]		* [https://www.kernel.org/pub/software/scm/git/docs/tutorial.html Git Tutorial]
	* [http://git.or.cz/course/svn.html Switching from SVN to git using cogito]		* [http://git.or.cz/course/svn.html Switching from SVN to git using cogito]
	* [~~http~~://~~wiki.~~sourcemage.org/~~Git_Guide~~ Very good Git guide]		* [https://sourcemage.org/Git%20guide Very good Git guide]

	[[Category:Coding]]		[[Category:Coding]]

DoesItReallyMatter: Format, links

2019-03-11T07:40:08Z

Format, links

Show changes

DoesItReallyMatter: HTTPS for all sites that support encryption. Beware that git:// protocol is by default unencrypted. http://msmtp.sourceforge.net/ redirects to https://marlam.de/msmtp/

2019-03-11T06:45:10Z

HTTPS for all sites that support encryption. Beware that git:// protocol is by default unencrypted. http://msmtp.sourceforge.net/ redirects to https://marlam.de/msmtp/

← Older revision		Revision as of 06:45, 11 March 2019
Line 1:		Line 1:
	[~~http~~://git-scm.com/ Git] is a free and open source [[wikipedia:Revision_control\|version control system]]. It is used by programmers to keep track of the different versions of the files composing a software.		[https://git-scm.com/ Git] is a free and open source [[wikipedia:Revision_control\|version control system]]. It is used by programmers to keep track of the different versions of the files composing a software.

	= Basic Git usage =		= Basic Git usage =
Line 7:		Line 7:
	== Getting VLC or x264 source code via Git ==		== Getting VLC or x264 source code via Git ==

	$ git clone ~~http~~://git.videolan.org/git/vlc.git		$ git clone https://git.videolan.org/git/vlc.git
	Voilà! The full VLC history should be on your hard disk in vlc/.		Voilà! The full VLC history should be on your hard disk in vlc/.

	$ git clone ~~http~~://git.videolan.org/git/x264.git		$ git clone https://git.videolan.org/git/x264.git
	Voilà! The full x264 history should be on your hard disk in x264/.		Voilà! The full x264 history should be on your hard disk in x264/.

	If you want only the last 3 VLC revisions:		If you want only the last 3 VLC revisions:
	$ git clone ~~http~~://git.videolan.org/git/vlc.git --depth 3		$ git clone https://git.videolan.org/git/vlc.git --depth 3

	Clones without the full revision set (--depth) can't be used for backporting (or to make sure that you're including at least commits up to the common fork point).		Clones without the full revision set (--depth) can't be used for backporting (or to make sure that you're including at least commits up to the common fork point).

	You can also have the VLC stable branch, here:		You can also have the VLC stable branch, here:
	$ git clone ~~http~~://git.videolan.org/git/vlc/vlc-2.2.git		$ git clone https://git.videolan.org/git/vlc/vlc-2.2.git
	Voilà! You got the stable branch repository.		Voilà! You got the stable branch repository.

	See ~~http~~://git.videolan.org/?p=vlc.git;a=summary		See https://git.videolan.org/?p=vlc.git;a=summary

	Or via http protocol from github (github can sometimes be a bit behind as a mirror):		Or via http protocol from github (github can sometimes be a bit behind as a mirror):
Line 39:		Line 39:
	to see the log graphically.		to see the log graphically.

	You can also browse the sources via [~~http~~://git.videolan.org/ gitweb].		You can also browse the sources via [https://git.videolan.org/ gitweb].

	== Configure your global git config ==		== Configure your global git config ==
Line 59:		Line 59:

	====MSMTP====		====MSMTP====
	You can use [~~http~~://msmtp~~.sourceforge.net~~/ msmtp] to achieve this. Install it with tls and ssl activated and place the following config file (.msmtprc) in your home directory		You can use [https://marlam.de/msmtp/ msmtp] to achieve this. Install it with tls and ssl activated and place the following config file (.msmtprc) in your home directory
	# msmtp configuration file		# msmtp configuration file

Line 82:		Line 82:
	Then configure git to use msmtp. The password will be asked for upon sending mail.		Then configure git to use msmtp. The password will be asked for upon sending mail.
	$ git config --global sendemail.smtpserver /usr/local/bin/msmtp		$ git config --global sendemail.smtpserver /usr/local/bin/msmtp
	The certificate for gmail can be found here: [~~http~~://www.geotrust.com/resources/extended-validation-ssl/certs/Equifax%20Secure%20Certificate%20Authority.crt EquifaxSecureCertificateAuthority.crt]		The certificate for gmail can be found here: [https://www.geotrust.com/resources/extended-validation-ssl/certs/Equifax%20Secure%20Certificate%20Authority.crt EquifaxSecureCertificateAuthority.crt]

	If you receive a '''cannot set X509 trust file''' error when using another CA certificate, make sure it is in the PEM (text format) rather than DER format (binary).		If you receive a '''cannot set X509 trust file''' error when using another CA certificate, make sure it is in the PEM (text format) rather than DER format (binary).
Line 299:		Line 299:

	Get the -bugfix git:		Get the -bugfix git:
	$ git clone ~~http~~://git.videolan.org/git/vlc/vlc-1.0.git vlc-bugfix		$ git clone https://git.videolan.org/git/vlc/vlc-1.0.git vlc-bugfix
	Add vlc.git as an additional remote:		Add vlc.git as an additional remote:
	$ git remote add vlc-master ~~http~~://git.videolan.org/git/vlc.git		$ git remote add vlc-master https://git.videolan.org/git/vlc.git
	Update the information from vlc-master		Update the information from vlc-master
	$ git fetch vlc-master		$ git fetch vlc-master
Line 373:		Line 373:

	== Tracking regression ==		== Tracking regression ==
	git has a great tool called [~~http~~://www.kernel.org/pub/software/scm/git/docs/git-bisect.html git-bisect] to help you to track a faulty commit. Imagine you are tracking a bug that is known to appear after 0.8.6 (assuming 0.8.6 is tagged):		git has a great tool called [https://www.kernel.org/pub/software/scm/git/docs/git-bisect.html git-bisect] to help you to track a faulty commit. Imagine you are tracking a bug that is known to appear after 0.8.6 (assuming 0.8.6 is tagged):
	$ git bisect start		$ git bisect start
	$ git bisect bad # tell git current version has the bug you are tracking		$ git bisect bad # tell git current version has the bug you are tracking
Line 386:		Line 386:
	If you can provide a script that test the presence of the bug		If you can provide a script that test the presence of the bug
	$ git bisect run <script_name>		$ git bisect run <script_name>
	will be able to track down the regression by itself. See [~~http~~://www.kernel.org/pub/software/scm/git/docs/git-bisect.html git-bisect Documentation].		will be able to track down the regression by itself. See [https://www.kernel.org/pub/software/scm/git/docs/git-bisect.html git-bisect Documentation].

	= Using Git to push to VideoLAN git =		= Using Git to push to VideoLAN git =
Line 398:		Line 398:
	$ vi vlc/.git/config		$ vi vlc/.git/config
	And replace		And replace
	~~http~~://git.videolan.org/git/vlc.git		https://git.videolan.org/git/vlc.git
	With		With
	git@git.videolan.org:vlc.git		git@git.videolan.org:vlc.git
Line 419:		Line 419:
	= Using Git to publish your work (for SoC student?) =		= Using Git to publish your work (for SoC student?) =
	First get the official VLC '''Soc''' trunk		First get the official VLC '''Soc''' trunk
	$ git clone ~~http~~://git.videolan.org/git/vlc-soc.git		$ git clone https://git.videolan.org/git/vlc-soc.git
	$ cd vlc-soc		$ cd vlc-soc
	Ask for write access to a branch (called your_name_branch). Now we will make git know that you want to publish on this branch		Ask for write access to a branch (called your_name_branch). Now we will make git know that you want to publish on this branch
Line 432:		Line 432:
	And don't forget to publish your changes:		And don't forget to publish your changes:
	$ git push my_soc_public_branch		$ git push my_soc_public_branch
	Now you should be able to see your latest changes in your branch via [~~http~~://git.videolan.org/ gitweb].		Now you should be able to see your latest changes in your branch via [https://git.videolan.org/ gitweb].
	-->		-->

	= Documentation about git =		= Documentation about git =
	* [~~http~~://git-scm.com/ Official Git Website]		* [https://git-scm.com/ Official Git Website]
	* [~~http~~://www.kernel.org/pub/software/scm/git/docs/tutorial.html Git Tutorial]		* [https://www.kernel.org/pub/software/scm/git/docs/tutorial.html Git Tutorial]
	* [http://git.or.cz/course/svn.html Switching from SVN to git using cogito]		* [http://git.or.cz/course/svn.html Switching from SVN to git using cogito]
	* [http://wiki.sourcemage.org/Git_Guide Very good Git guide]		* [http://wiki.sourcemage.org/Git_Guide Very good Git guide]

	[[Category:Coding]]		[[Category:Coding]]

DoesItReallyMatter: Fix broken wikilink, nn other

2019-03-09T09:08:58Z

Fix broken wikilink, nn other

← Older revision		Revision as of 09:08, 9 March 2019
Line 3:		Line 3:
	= Basic Git usage =		= Basic Git usage =

	If you are using '''Windows''', please read the [[~~Git_Windows~~]] page.		If you are using '''Windows''', please read the [[Git Windows]] page.

	== Getting VLC or x264 source code via Git ==		== Getting VLC or x264 source code via Git ==
Line 390:		Line 390:
	= Using Git to push to VideoLAN git =		= Using Git to push to VideoLAN git =
	== Initial requirements ==		== Initial requirements ==
	* You must have credentials to push commits into the repository. For other contributors, please read upper [[~~Git~~#~~Submitting_patches_to_the_vlc-devel_or_x264-devel~~\|Submitting patches to the vlc-devel or x264-devel]] paragraph.		* You must have credentials to push commits into the repository. For other contributors, please read upper [[#Submitting_patches\|Submitting patches to the vlc-devel or x264-devel]] paragraph.
	* Make sure you've set your name and email in your commits		* Make sure you've set your name and email in your commits
	$ git config --global user.name "Your Name"		$ git config --global user.name "Your Name"

DoesItReallyMatter: Mac OS X → macOS

2019-01-24T09:32:52Z

Mac OS X → macOS

← Older revision		Revision as of 09:32, 24 January 2019
Line 86:		Line 86:
	If you receive a '''cannot set X509 trust file''' error when using another CA certificate, make sure it is in the PEM (text format) rather than DER format (binary).		If you receive a '''cannot set X509 trust file''' error when using another CA certificate, make sure it is in the PEM (text format) rather than DER format (binary).

	====~~Mac OS X~~====		====macOS====

	Setup info with e.g. gmail account		Setup info with e.g. gmail account

Thresh at 15:23, 5 December 2015

2015-12-05T15:23:58Z

← Older revision		Revision as of 15:23, 5 December 2015
Line 7:		Line 7:
	== Getting VLC or x264 source code via Git ==		== Getting VLC or x264 source code via Git ==

	$ git clone ~~git~~://git.videolan.org/vlc.git		$ git clone http://git.videolan.org/git/vlc.git
	Voilà! The full VLC history should be on your hard disk in vlc/.		Voilà! The full VLC history should be on your hard disk in vlc/.

	$ git clone ~~git~~://git.videolan.org/x264.git		$ git clone http://git.videolan.org/git/x264.git
	Voilà! The full x264 history should be on your hard disk in x264/.		Voilà! The full x264 history should be on your hard disk in x264/.

	If you want only the last 3 VLC revisions:		If you want only the last 3 VLC revisions:
	$ git clone ~~git~~://git.videolan.org/vlc.git --depth 3		$ git clone http://git.videolan.org/git/vlc.git --depth 3

	Clones without the full revision set (--depth) can't be used for backporting (or to make sure that you're including at least commits up to the common fork point).		Clones without the full revision set (--depth) can't be used for backporting (or to make sure that you're including at least commits up to the common fork point).

	You can also have the VLC stable branch, here:		You can also have the VLC stable branch, here:
	$ git clone ~~git~~://git.videolan.org/vlc/vlc-2.2.git		$ git clone http://git.videolan.org/git/vlc/vlc-2.2.git
	Voilà! You got the stable branch repository.		Voilà! You got the stable branch repository.

	~~Or via http protocol from the main site:~~
	~~$ git clone http://git.videolan.org/git/vlc.git~~
	See http://git.videolan.org/?p=vlc.git;a=summary		See http://git.videolan.org/?p=vlc.git;a=summary

Line 301:		Line 299:

	Get the -bugfix git:		Get the -bugfix git:
	$ git clone ~~git~~://git.videolan.org/vlc/vlc-1.0.git vlc-bugfix		$ git clone http://git.videolan.org/git/vlc/vlc-1.0.git vlc-bugfix
	Add vlc.git as an additional remote:		Add vlc.git as an additional remote:
	$ git remote add vlc-master ~~git~~://git.videolan.org/vlc.git		$ git remote add vlc-master http://git.videolan.org/git/vlc.git
	Update the information from vlc-master		Update the information from vlc-master
	$ git fetch vlc-master		$ git fetch vlc-master
Line 400:		Line 398:
	$ vi vlc/.git/config		$ vi vlc/.git/config
	And replace		And replace
	~~git~~://git.videolan.org/vlc.git		http://git.videolan.org/git/vlc.git
	With		With
	git@git.videolan.org:vlc.git		git@git.videolan.org:vlc.git
Line 421:		Line 419:
	= Using Git to publish your work (for SoC student?) =		= Using Git to publish your work (for SoC student?) =
	First get the official VLC '''Soc''' trunk		First get the official VLC '''Soc''' trunk
	$ git clone ~~git~~://git.videolan.org/vlc-soc.git		$ git clone http://git.videolan.org/git/vlc-soc.git
	$ cd vlc-soc		$ cd vlc-soc
	Ask for write access to a branch (called your_name_branch). Now we will make git know that you want to publish on this branch		Ask for write access to a branch (called your_name_branch). Now we will make git know that you want to publish on this branch

DozyB: Updating stable-branch git link, to 2.2. Now matches https://wiki.videolan.org/GetTheSource/

2015-05-20T21:24:07Z

Updating stable-branch git link, to 2.2. Now matches https://wiki.videolan.org/GetTheSource/

← Older revision		Revision as of 21:24, 20 May 2015
Line 19:		Line 19:

	You can also have the VLC stable branch, here:		You can also have the VLC stable branch, here:
	$ git clone git://git.videolan.org/vlc/vlc-2.0.git		$ git clone git://git.videolan.org/vlc/vlc-2.2.git
	Voilà! You got the stable branch repository.		Voilà! You got the stable branch repository.

J-b: /* Submitting patches */

2015-02-17T10:51:56Z

Submitting patches

← Older revision		Revision as of 10:51, 17 February 2015
Line 191:		Line 191:
	$ git-gui # Commit/push/... editor		$ git-gui # Commit/push/... editor

	== Submitting patches ==		= Submitting patches =

	First make sure you have '''read''' our [[Sending Patches]] page. And that you've '''read''' the [[Sending Patches#Check_List\| Check List]].		First make sure you have '''read''' our [[Sending Patches]] page. And that you've '''read''' the [[Sending Patches#Check_List\| Check List]].

DoesItReallyMatter: c/e

2014-11-03T05:02:47Z

c/e

← Older revision		Revision as of 05:02, 3 November 2014
Line 156:		Line 156:
	You can now list your local branch by doing		You can now list your local branch by doing
	$ git branch		$ git branch
	which should ~~ouput~~		which should output
	$ git branch		$ git branch
	* master		* master
Line 164:		Line 164:

	== Commit ==		== Commit ==
	Now you can start to work on your tree. As soon as you feel you have reached a step in ~~developement~~ where you can commit your work '''locally''', use		Now you can start to work on your tree. As soon as you feel you have reached a step in development where you can commit your work '''locally''', use
	$ git commit -a		$ git commit -a
	or		or
Line 284:		Line 284:

	== Backporting commits ==		== Backporting commits ==
	It is possible to "backport" commit between the master branch and a -bugfix branch. However since VDD'09, the bugfix branches have been ~~splitted~~ to their own git repositories. This leaves us with 2 cases.		It is possible to "backport" commit between the master branch and a -bugfix branch. However since VDD'09, the bugfix branches have been split to their own git repositories. This leaves us with 2 cases.

	=== Normal simple case ===		=== Normal simple case ===
Line 294:		Line 294:
	$ git cherry-pick -x -s <sha-id of commit>		$ git cherry-pick -x -s <sha-id of commit>

	If git fails to do the backport by itself, you'll be ~~presnted~~ with the usual options in case of a failed merge or patching. Use "git status", your favorite editor or "git mergetool" to resolve the situation. Then use "git add" and "git commit -c <sha-id of backported commit>".		If git fails to do the backport by itself, you'll be presented with the usual options in case of a failed merge or patching. Use "git status", your favorite editor or "git mergetool" to resolve the situation. Then use "git add" and "git commit -c <sha-id of backported commit>".
	Then push your commit as usual.		Then push your commit as usual.

Line 407:		Line 407:
	$ git pull --rebase		$ git pull --rebase

	If you don't want to have to type --rebase ~~everytime~~ you pull do:		If you don't want to have to type --rebase every time you pull do:
	$ git config branch.master.rebase true		$ git config branch.master.rebase true