Jump to content

Git: Difference between revisions

From Wikipedia, the free encyclopedia
Content deleted Content added
Add a "naming" section so that people can more easily link to just that section of history. Content unchanged.
Line 47: Line 47:
These criteria eliminated every then-extant [[version control system]], so immediately after the 2.6.12-rc2 Linux kernel development release, Torvalds set out to write his own.<ref name="linusGoogleTalk" />
These criteria eliminated every then-extant [[version control system]], so immediately after the 2.6.12-rc2 Linux kernel development release, Torvalds set out to write his own.<ref name="linusGoogleTalk" />


The development of Git began on 3 April 2005.<ref name="selfhost">{{cite mailing list|url=https://marc.info/?l=git&m=117254154130732|title=Re: Trivia: When did git self-host?|date=2007-02-27|last=Torvalds|first=Linus|mailinglist=git}}</ref> Torvalds announced the project on 6 April;<ref>{{cite mailing list|url=https://marc.info/?l=linux-kernel&m=111280216717070|title=Kernel SCM saga..|date=2005-04-06|last=Torvalds|first=Linus|mailinglist=linux-kernel}}</ref> it became [[self-hosting]] as of 7 April.<ref name="selfhost" /> The first merge of multiple branches took place on 18 April.<ref>{{cite mailing list|url=https://marc.info/?l=git&m=111377572329534|title=First ever real kernel git merge!|date=2005-04-17|last=Torvalds|first=Linus|mailinglist=git}}</ref> Torvalds achieved his performance goals; on 29 April, the nascent Git was benchmarked recording patches to the Linux kernel tree at the rate of 6.7 patches per second.<ref>{{cite mailing list|url=https://marc.info/?l=git&m=111475459526688|title=Mercurial 0.4b vs git patchbomb benchmark|date=2005-04-29|last=Mackall|first=Matt|mailinglist=git}}</ref> On 16 June Git managed the kernel 2.6.12 release.<ref>{{cite mailing list|url=https://marc.info/?l=git-commits-head&m=111904216911731|title=Linux 2.6.12|date=2005-06-17|last=Torvalds|first=Linus|mailinglist=git-commits-head}}</ref>

Torvalds turned over [[software maintenance|maintenance]] on 26 July 2005 to [[Junio Hamano]], a major contributor to the project.<ref>{{cite mailing list|url=https://marc.info/?l=git&m=112243466603239|title=Meet the new maintainer...|date=2005-07-27|last=Torvalds|first=Linus|mailinglist=git}}</ref> Hamano was responsible for the 1.0 release on 21 December 2005, and remains the project's maintainer.<ref>{{cite mailing list|url=https://marc.info/?l=git&m=113515203321888|title=Announce: Git 1.0.0|date=2005-12-21|last=Hamano|first=Junio C.|mailinglist=git}}</ref>

=== Naming ===
Torvalds quipped about the name ''git'' (which means ''unpleasant person'' in [[British English]] slang): "I'm an egotistical bastard, and I name all my projects after myself. First '[[Linux kernel|Linux]]', now 'git'."<ref name="whythegitname">{{cite web
Torvalds quipped about the name ''git'' (which means ''unpleasant person'' in [[British English]] slang): "I'm an egotistical bastard, and I name all my projects after myself. First '[[Linux kernel|Linux]]', now 'git'."<ref name="whythegitname">{{cite web
|url = https://git.wiki.kernel.org/index.php/GitFaq#Why_the_.27Git.27_name.3F
|url = https://git.wiki.kernel.org/index.php/GitFaq#Why_the_.27Git.27_name.3F
Line 68: Line 73:
- "goddamn idiotic truckload of sh*t": when it breaks
- "goddamn idiotic truckload of sh*t": when it breaks


</syntaxhighlight>
</syntaxhighlight>The development of Git began on 3 April 2005.<ref name="selfhost">{{cite mailing list |mailinglist= git |last= Torvalds |first= Linus |url= https://marc.info/?l=git&m=117254154130732
|title= Re: Trivia: When did git self-host? |date= 2007-02-27}}</ref> Torvalds announced the project on 6 April;<ref>{{cite mailing list |mailinglist=linux-kernel |last=Torvalds |first=Linus |url=https://marc.info/?l=linux-kernel&m=111280216717070 |title=Kernel SCM saga.. |date= 2005-04-06}}</ref> it became [[self-hosting]] as of 7 April.<ref name="selfhost" /> The first merge of multiple branches took place on 18 April.<ref>{{cite mailing list |mailinglist= git |last= Torvalds |first= Linus |url= https://marc.info/?l=git&m=111377572329534 |title= First ever real kernel git merge! |date= 2005-04-17}}</ref> Torvalds achieved his performance goals; on 29 April, the nascent Git was benchmarked recording patches to the Linux kernel tree at the rate of 6.7 patches per second.<ref>{{cite mailing list |mailinglist= git |last= Mackall |first= Matt |url= https://marc.info/?l=git&m=111475459526688 |title= Mercurial 0.4b vs git patchbomb benchmark |date= 2005-04-29}}</ref> On 16 June Git managed the kernel 2.6.12 release.<ref>{{cite mailing list |mailinglist= git-commits-head |last= Torvalds |first= Linus
|url= https://marc.info/?l=git-commits-head&m=111904216911731 |title= Linux 2.6.12 |date= 2005-06-17}}</ref>
Torvalds turned over [[software maintenance|maintenance]] on 26 July 2005 to [[Junio Hamano]], a major contributor to the project.<ref>{{cite mailing list |mailinglist= git |last= Torvalds |first= Linus |url=https://marc.info/?l=git&m=112243466603239 |title= Meet the new maintainer... |date= 2005-07-27}}</ref> Hamano was responsible for the 1.0 release on 21 December 2005, and remains the project's maintainer.<ref>{{cite mailing list |mailinglist= git |last= Hamano |first= Junio C. |url= https://marc.info/?l=git&m=113515203321888 |title= Announce: Git 1.0.0 |date= 2005-12-21}}</ref>

=== Releases ===
=== Releases ===
{| class="wikitable"
{| class="wikitable"

Revision as of 16:42, 16 July 2018

Git
Original author(s)Linus Torvalds[1]
Developer(s)Junio Hamano and others[2]
Initial release7 April 2005; 19 years ago (2005-04-07)
Stable release
2.18.0 / 21 June 2018; 6 years ago (2018-06-21)[3]
Repositorygithub.com/git/git git.kernel.org/pub/scm/git/git.git/
Written inC, Shell, Perl, Tcl, Python[4]
Operating systemPOSIX: Linux, Windows, macOS
PlatformIA-32, x86-64
Available inEnglish
TypeVersion control
LicenseGNU GPL v2[5] and GNU LGPL v2.1[6]
Websitegit-scm.com

Git (/ɡɪt/[7]) is a version control system for tracking changes in computer files and coordinating work on those files among multiple people. It is primarily used for source code management in software development,[8] but it can be used to keep track of changes in any set of files. As a distributed revision control system, it is aimed at speed,[9] data integrity,[10] and support for distributed, non-linear workflows.[11]

Git was created by Linus Torvalds in 2005 for development of the Linux kernel, with other kernel developers contributing to its initial development.[12] Its current maintainer since 2005 is Junio Hamano.

As with most other distributed version control systems, and unlike most client–server systems, every Git directory on every computer is a full-fledged repository with complete history and full version tracking abilities, independent of network access or a central server.[13]

Git is free and open source software distributed under the terms of the GNU General Public License version 2.

History

Git development began in April 2005, after many developers of the Linux kernel gave up access to BitKeeper, a proprietary source control management (SCM) system that they had formerly used to maintain the project.[14] The copyright holder of BitKeeper, Larry McVoy, had withdrawn free use of the product after claiming that Andrew Tridgell had reverse-engineered the BitKeeper protocols.[15] (The same incident would also spur the creation of another version control system, Mercurial.)

Linus Torvalds wanted a distributed system that he could use like BitKeeper, but none of the available free systems met his needs. Torvalds cited an example of a source-control management system needing 30 seconds to apply a patch and update all associated metadata, and noted that this would not scale to the needs of Linux kernel development, where synchronizing with fellow maintainers could require 250 such actions at once. For his design criteria, he specified that patching should take no more than three seconds,[9] and added three more points:

  • Take Concurrent Versions System (CVS) as an example of what not to do; if in doubt, make the exact opposite decision[11]
  • Support a distributed, BitKeeper-like workflow[11]
  • Include very strong safeguards against corruption, either accidental or malicious[10]

These criteria eliminated every then-extant version control system, so immediately after the 2.6.12-rc2 Linux kernel development release, Torvalds set out to write his own.[11]

The development of Git began on 3 April 2005.[16] Torvalds announced the project on 6 April;[17] it became self-hosting as of 7 April.[16] The first merge of multiple branches took place on 18 April.[18] Torvalds achieved his performance goals; on 29 April, the nascent Git was benchmarked recording patches to the Linux kernel tree at the rate of 6.7 patches per second.[19] On 16 June Git managed the kernel 2.6.12 release.[20]

Torvalds turned over maintenance on 26 July 2005 to Junio Hamano, a major contributor to the project.[21] Hamano was responsible for the 1.0 release on 21 December 2005, and remains the project's maintainer.[22]

Naming

Torvalds quipped about the name git (which means unpleasant person in British English slang): "I'm an egotistical bastard, and I name all my projects after myself. First 'Linux', now 'git'."[23][24] The man page describes Git as "the stupid content tracker".[25] The readme file of the source code elaborates further:[26]

The name "git" was given by Linus Torvalds when he wrote the very
first version. He described the tool as "the stupid content tracker"
and the name as (depending on your way):

 - random three-letter combination that is pronounceable, and not actually used by any common UNIX command. The fact that it is a mispronunciation of "get" may or may not be relevant.
 - stupid. contemptible and despicable. simple. Take your pick from the dictionary of slang.
 - "global information tracker": you're in a good mood, and it actually works for you. Angels sing, and a light suddenly fills the room.
 - "goddamn idiotic truckload of sh*t": when it breaks

Releases

Version Original release date [citation needed] Latest (patch) version Release date (of patch) [citation needed]
Old version, no longer maintained: 0.99 2005-07-11 0.99.9n 2005-12-15
Old version, no longer maintained: 1.0 2005-12-21 1.0.13 2006-01-27
Old version, no longer maintained: 1.1 2006-01-08 1.1.6 2006-01-30
Old version, no longer maintained: 1.2 2006-02-12 1.2.6 2006-04-08
Old version, no longer maintained: 1.3 2006-04-18 1.3.3 2006-05-16
Old version, no longer maintained: 1.4 2006-06-10 1.4.4.5 2008-07-16
Old version, no longer maintained: 1.5 2007-02-14 1.5.6.6 2008-12-17
Old version, no longer maintained: 1.6 2008-08-17 1.6.6.3 2010-12-15
Old version, no longer maintained: 1.7 2010-02-13 1.7.12.4 2012-10-17
Old version, no longer maintained: 1.8 2012-10-21 1.8.5.6 2014-12-17
Old version, no longer maintained: 1.9 2014-02-14 1.9.5 2014-12-17
Old version, no longer maintained: 2.0 2014-05-28 2.0.5 2014-12-17
Old version, no longer maintained: 2.1 2014-08-16 2.1.4 2014-12-17
Old version, no longer maintained: 2.2 2014-11-26 2.2.3 2015-09-04
Old version, no longer maintained: 2.3 2015-02-05 2.3.10 2015-09-29
Old version, no longer maintained: 2.4 2015-04-30 2.4.12 2017-05-05
Old version, no longer maintained: 2.5 2015-07-27 2.5.6 2017-05-05
Old version, no longer maintained: 2.6 2015-09-28 2.6.7 2017-05-05
Old version, no longer maintained: 2.7 2015-10-04 2.7.6 2017-07-30
Old version, no longer maintained: 2.8 2016-03-28 2.8.6 2017-07-30
Old version, no longer maintained: 2.9 2016-06-13 2.9.5 2017-07-30
Old version, no longer maintained: 2.10 2016-09-02 2.10.5 2017-09-22
Old version, no longer maintained: 2.11 2016-11-29 2.11.4 2017-09-22
Old version, no longer maintained: 2.12 2017-02-24 2.12.5 2017-09-22
Old version, yet still maintained: 2.13 2017-05-10 2.13.7 2018-05-29
Old version, yet still maintained: 2.14 2017-08-04 2.14.4 2018-05-29
Old version, yet still maintained: 2.15 2017-10-30 2.15.2 2018-05-29
Old version, yet still maintained: 2.16 2018-01-17 2.16.4 2018-05-29
Current stable version: 2.17 2018-04-02 2.17.1 2018-05-29
Legend:
Old version, not maintained
Old version, still maintained
Latest version
Latest preview version
Future release

Design

Git's design was inspired by BitKeeper and Monotone.[27][28] Git was originally designed as a low-level version control system engine on top of which others could write front ends, such as Cogito or StGIT.[28] The core Git project has since become a complete version control system that is usable directly.[29] While strongly influenced by BitKeeper, Torvalds deliberately avoided conventional approaches, leading to a unique design.[30]

Characteristics

Git's design is a synthesis of Torvalds's experience with Linux in maintaining a large distributed development project, along with his intimate knowledge of file system performance gained from the same project and the urgent need to produce a working system in short order. These influences led to the following implementation choices [citation needed]:

Strong support for non-linear development
Git supports rapid branching and merging, and includes specific tools for visualizing and navigating a non-linear development history. In Git, a core assumption is that a change will be merged more often than it is written, as it is passed around to various reviewers. In Git, branches are very lightweight: a branch is only a reference to one commit. With its parental commits, the full branch structure can be constructed.
Distributed development
Like Darcs, BitKeeper, Mercurial, SVK, Bazaar, and Monotone, Git gives each developer a local copy of the full development history and changes are copied from one such repository to another. These changes are imported as added development branches, and can be merged in the same way as a locally developed branch.
Compatibility with existent systems and protocols
Repositories can be published via Hypertext Transfer Protocol (HTTP), File Transfer Protocol (FTP), rsync (removed in Git 2.8.0[31]), or a Git protocol over either a plain socket, or Secure Shell (ssh). Git also has a CVS server emulation, which enables the use of extant CVS clients and IDE plugins to access Git repositories. Subversion and svk repositories can be used directly with git-svn.
Efficient handling of large projects
Torvalds has described Git as being very fast and scalable,[32] and performance tests done by Mozilla[33] showed it was an order of magnitude faster than some version control systems, and fetching version history from a locally stored repository can be one hundred times faster than fetching it from the remote server.[34]
Cryptographic authentication of history
The Git history is stored in such a way that the ID of a particular version (a commit in Git terms) depends upon the complete development history leading up to that commit. Once it is published, it is not possible to change the old versions without it being noticed. The structure is similar to a Merkle tree, but with added data at the nodes and leaves.[35] (Mercurial and Monotone also have this property.)
Toolkit-based design
Git was designed as a set of programs written in C, and several shell scripts that provide wrappers around those programs.[36] Although most of those scripts have since been rewritten in C for speed and portability, the design remains, and it is easy to chain the components together.[37]
Pluggable merge strategies
As part of its toolkit design, Git has a well-defined model of an incomplete merge, and it has multiple algorithms for completing it, culminating in telling the user that it is unable to complete the merge automatically and that manual editing is needed.
Garbage accumulates until collected
Aborting operations or backing out changes will leave useless dangling objects in the database. These are generally a small fraction of the continuously growing history of wanted objects. Git will automatically perform garbage collection when enough loose objects have been created in the repository. Garbage collection can be called explicitly using git gc --prune.[38]
Periodic explicit object packing
Git stores each newly created object as a separate file. Although individually compressed, this takes a great deal of space and is inefficient. This is solved by the use of packs that store a large number of objects delta-compressed among themselves in one file (or network byte stream) called a packfile. Packs are compressed using the heuristic that files with the same name are probably similar, but do not depend on it for correctness. A corresponding index file is created for each packfile, telling the offset of each object in the packfile. Newly created objects (with newly added history) are still stored as single objects and periodic repacking is needed to maintain space efficiency. The process of packing the repository can be very computationally costly. By allowing objects to exist in the repository in a loose but quickly generated format, Git allows the costly pack operation to be deferred until later, when time matters less, e.g., the end of a work day. Git does periodic repacking automatically but manual repacking is also possible with the git gc command. For data integrity, both the packfile and its index have an SHA-1 checksum inside and the file name of the packfile also contains an SHA-1 checksum. To check the integrity of a repository, run the git fsck command.

Another property of Git is that it snapshots directory trees of files. The earliest systems for tracking versions of source code, Source Code Control System (SCCS) and Revision Control System (RCS), worked on individual files and emphasized the space savings to be gained from interleaved deltas (SCCS) or delta encoding (RCS) the (mostly similar) versions. Later revision control systems maintained this notion of a file having an identity across multiple revisions of a project. However, Torvalds rejected this concept.[39] Consequently, Git does not explicitly record file revision relationships at any level below the source code tree.

These implicit revision relationships have some significant consequences:

  • It is slightly more costly to examine the change history of one file than the whole project.[40] To obtain a history of changes affecting a given file, Git must walk the global history and then determine whether each change modified that file. This method of examining history does, however, let Git produce with equal efficiency a single history showing the changes to an arbitrary set of files. For example, a subdirectory of the source tree plus an associated global header file is a very common case.
  • Renames are handled implicitly rather than explicitly. A common complaint with CVS is that it uses the name of a file to identify its revision history, so moving or renaming a file is not possible without either interrupting its history, or renaming the history and thereby making the history inaccurate. Most post-CVS revision control systems solve this by giving a file a unique long-lived name (analogous to an inode number) that survives renaming. Git does not record such an identifier, and this is claimed as an advantage.[41][42] Source code files are sometimes split or merged, or simply renamed,[43] and recording this as a simple rename would freeze an inaccurate description of what happened in the (immutable) history. Git addresses the issue by detecting renames while browsing the history of snapshots rather than recording it when making the snapshot.[44] (Briefly, given a file in revision N, a file of the same name in revision N−1 is its default ancestor. However, when there is no like-named file in revision N−1, Git searches for a file that existed only in revision N−1 and is very similar to the new file.) However, it does require more CPU-intensive work every time the history is reviewed, and several options to adjust the heuristics are available. This mechanism does not always work; sometimes a file that is renamed with changes in the same commit is read as a deletion of the old file and the creation of a new file. Developers can work around this limitation by committing the rename and the changes separately.

Git implements several merging strategies; a non-default strategy can be selected at merge time:[45]

  • resolve: the traditional three-way merge algorithm.
  • recursive: This is the default when pulling or merging one branch, and is a variant of the three-way merge algorithm.

    When there are more than one common ancestors that can be used for three-way merge, it creates a merged tree of the common ancestors and uses that as the reference tree for the three-way merge. This has been reported to result in fewer merge conflicts without causing mis-merges by tests done on prior merge commits taken from Linux 2.6 kernel development history. Also, this can detect and handle merges involving renames.

    — Linus Torvalds[46]
  • octopus: This is the default when merging more than two heads.

Data structures

Git's primitives are not inherently a source-code management system. Torvalds explains,[47]

In many ways you can just see git as a filesystem – it's content-addressable, and it has a notion of versioning, but I really really designed it coming at the problem from the viewpoint of a filesystem person (hey, kernels is what I do), and I actually have absolutely zero interest in creating a traditional SCM system.

From this initial design approach, Git has developed the full set of features expected of a traditional SCM,[29] with features mostly being created as needed, then refined and extended over time.

Some data flows and storage levels in the Git revision control system.

Git has two data structures: a mutable index (also called stage or cache) that caches information about the working directory and the next revision to be committed; and an immutable, append-only object database.

The index serves as connection point between the object database and the working tree.

The object database contains four types of objects:

  • A blob (binary large object) is the content of a file. Blobs have no proper file name, time stamps, or other metadata. (A blob's name internally is a hash of its content.)
  • A tree object is the equivalent of a directory. It contains a list of file names, each with some type bits and a reference to a blob or tree object that is that file, symbolic link, or directory's contents. These objects are a snapshot of the source tree. (In whole, this comprises a Merkle tree, meaning that only a single hash for the root tree is sufficient and actually used in commits to exactly pinpoint to the exact state of whole tree structures of any number of sub-directories and files.)
  • A commit object links tree objects together into a history. It contains the name of a tree object (of the top-level source directory), a time stamp, a log message, and the names of zero or more parent commit objects.
  • A tag object is a container that contains a reference to another object and can hold added meta-data related to another object. Most commonly, it is used to store a digital signature of a commit object corresponding to a particular release of the data being tracked by Git.

Each object is identified by a SHA-1 hash of its contents. Git computes the hash, and uses this value for the object's name. The object is put into a directory matching the first two characters of its hash. The rest of the hash is used as the file name for that object.

Git stores each revision of a file as a unique blob. The relationships between the blobs can be found through examining the tree and commit objects. Newly added objects are stored in their entirety using zlib compression. This can consume a large amount of disk space quickly, so objects can be combined into packs, which use delta compression to save space, storing blobs as their changes relative to other blobs.

Git servers typically listen on TCP port 9418.[48]

References

Every object in the Git database which is not referred to may be cleaned up by using a garbage collection command, or automatically. An object may be referenced by another object, or an explicit reference. Git knows different types of references. The commands to create, move, and delete references vary. "git show-ref" lists all references. Some types are:

  • heads: refers to an object locally
  • remotes: refers to an object which exists in a remote repository
  • stash: refers to an object not yet committed
  • meta: e.g. a configuration in a bare repository, user rights; the refs/meta/config namespace was introduced resp gets used by Gerrit[clarification needed][49]
  • tags: see above

Implementations

gitg is a graphical front-end using GTK+

Git is primarily developed on Linux, although it also supports most major operating systems including BSD, Solaris, macOS, and Windows.[50]

The first Windows port of Git was primarily a Linux emulation framework that hosts the Linux version. Installing Git under Windows creates a similarly named Program Files directory containing the MinGW port of the GNU Compiler Collection, Perl 5, msys2.0 (itself a fork of Cygwin, a Unix-like emulation environment for Windows) and various other Windows ports or emulations of Linux utilities and libraries. Currently native Windows builds of Git are distributed as 32 and 64-bit installers.[51]

The JGit implementation of Git is a pure Java software library, designed to be embedded in any Java application. JGit is used in the Gerrit code review tool and in EGit, a Git client for the Eclipse IDE.[52]

The Dulwich implementation of Git is a pure Python software component for Python 2.7, 3.4 and 3.5[53]

The libgit2 implementation of Git is an ANSI C software library with no other dependencies, which can be built on multiple platforms including Windows, Linux, macOS, and BSD.[54] It has bindings for many programming languages, including Ruby, Python, and Haskell.[55][56][57]

JS-Git is a JavaScript implementation of a subset of Git.[58]

Git server

Screenshot of Gitweb interface showing a commit diff

As Git is a distributed version control system, it could be used as a server out of the box. Dedicated Git server software helps, amongst other features, to add access control, display the contents of a Git repository via the web, and help managing multiple repositories. Remote file store and shell access: A Git repository can be cloned to a shared file system, and accessed by other persons. It can also be accessed via remote shell just by having the Git software installed and allowing a user to log in.[59]

Open source

  • gitolite, scripts on top of git software to provide fine grained access control
  • Gerrit, a git server configurable to support code reviews, and providing access via ssh, an integrated Apache MINA or OpenSSH, or an integrated Jetty web server. Gerrit provides integration for LDAP, Active Directory, OpenID, OAuth, Kerberos/GSSAPI, X509 https client certificates. With Gerrit 3.0 all configurations will be stored as git repositories, no database required to run. Gerrit has a pull request feature implemented in its core but lacks a GUI for it.
  • Phabricator, a spin off from Facebook. As Facebook is using primarily Mercurial, the git support is not as prominent.[60]
  • Trac, supporting git, Mercurial, and Subversion with a modified BSD license.
  • Kallithea, supporting both git and Mercurial, developed in Python with GPL license.
  • Some of the other FLOSS full solutions for self-hosting are Gogs, and Gitea both developed in Go language with MIT license,

Open core

Some parts of the software are open source, additional features need a commercial license.

  • GitLab, similar to GitHub, lacks code review feature like gerrit, but implements pull requests - called "merge request"

As service

Best known are probably GitHub, and GitLab offerings, but many others are available, like GerritForge, etc.

Adoption

The Eclipse Foundation reported in its annual community survey that as of May 2014, Git is now the most widely used source-code management tool, with 42.9% of professional software developers reporting that they use Git as their primary source control system[61] compared with 36.3% in 2013, 32% in 2012; or for Git responses excluding use of GitHub: 33.3% in 2014, 30.3% in 2013, 27.6% in 2012 and 12.8% in 2011.[62] Open source directory Black Duck Open Hub reports a similar uptake among open source projects.[63] The Stack Overflow developer survey reported in 2015 that 69.3% of developers use Git; 36.9% use Subversion; 12.2% use TFS; and 7.9% use Mercurial.[64]

The UK IT jobs website itjobswatch.co.uk reports that as of late September 2016, 29.27% of UK permanent software development job openings have cited Git,[65] ahead of 12.17% for Microsoft Team Foundation Server,[66] 10.60% for Subversion,[67] 1.30% for Mercurial,[68] and 0.48% for Visual SourceSafe.[69]

Since February 2017, Microsoft has been in the process of migrating Microsoft Windows development to Git, migrating from Perforce. In order to handle the size of the Windows source code tree, Microsoft was required to develop customizations to the software, including Git Virtual File System (GVFS), a system which allows cloned repositories to use placeholders whose contents are downloaded only once a file is accessed.[70]

Extensions

There are many Git extensions, like Git LFS, that is started as an extension to Git in the Github community and now is widely used by other repositories. The two projects are independently developed and maintained by different people, but in some point in the future a widely used extension can be merged to Git.

Security

Git does not provide access control mechanisms, but was designed for operation with other tools that specialize in access control.[71]

On 17 December 2014, an exploit was found affecting the Windows and Mac versions of the Git client. An attacker could perform arbitrary code execution on a target computer with Git installed by creating a malicious Git tree (directory) named .git (a directory in Git repositories that stores all the data of the repository) in a different case (such as .GIT or .Git, needed because Git doesn't allow the all-lowercase version of .git to be created manually) with malicious files in the .git/hooks subdirectory (a folder with executable files that Git runs) on a repository that the attacker made or on a repository that the attacker can modify. If a Windows or Mac user pulls (downloads) a version of the repository with the malicious directory, then switches to that directory, the .git directory will be overwritten (due to the case-insensitive trait of the Windows and Mac filesystems) and the malicious executable files in .git/hooks may be run, which results in the attacker's commands being executed. An attacker could also modify the .git/config configuration file, which allows the attacker to create malicious Git aliases (aliases for Git commands or external commands) or modify extant aliases to execute malicious commands when run. The vulnerability was patched in version 2.2.1 of Git, released on 17 December 2014, and announced on the next day.[72][73]

Git version 2.6.1, released on 29 September 2015, contained a patch for a security vulnerability (CVE-2015-7545)[74] which allowed arbitrary code execution.[75] The vulnerability was exploitable if an attacker could convince a victim to clone a specific URL, as the arbitrary commands were embedded in the URL itself.[76] An attacker could use the exploit via a man-in-the-middle attack if the connection was unencrypted,[76] as they could redirect the user to a URL of their choice. Recursive clones were also vulnerable, since they allowed the controller of a repository to specify arbitrary URLs via the gitmodules file.[76]

Git uses SHA-1 hashes internally. Linus Torvalds has responded that the hash was mostly to guard against accidental corruption, and the security a cryptographically secure hash gives was just an accidental side effect, with the main security being signing elsewhere.[77][78]

See also

References

  1. ^ "Initial revision of "git", the information manager from hell". Github. 8 April 2005. Archived from the original on 16 November 2015. Retrieved 20 December 2015. {{cite web}}: Unknown parameter |deadurl= ignored (|url-status= suggested) (help)
  2. ^ "Commit Graph". Github. 8 June 2016. Archived from the original on 20 January 2016. Retrieved 19 December 2015. {{cite web}}: Unknown parameter |deadurl= ignored (|url-status= suggested) (help)
  3. ^ "Releases - git/git". Archived from the original on 20 September 2017. Retrieved 22 June 2018. {{cite web}}: Unknown parameter |deadurl= ignored (|url-status= suggested) (help)
  4. ^ "Git Source Code Mirror". Archived from the original on 8 February 2017. Retrieved 1 January 2017. {{cite web}}: Unknown parameter |deadurl= ignored (|url-status= suggested) (help)
  5. ^ "Git's GPL license at github.com". github.com. 18 January 2010. Archived from the original on 11 April 2016. Retrieved 12 October 2014. {{cite web}}: Unknown parameter |deadurl= ignored (|url-status= suggested) (help)
  6. ^ "Git's LGPL license at github.com". github.com. 20 May 2011. Archived from the original on 11 April 2016. Retrieved 12 October 2014. {{cite web}}: Unknown parameter |deadurl= ignored (|url-status= suggested) (help)
  7. ^ "Tech Talk: Linus Torvalds on git (at 00:01:30)". YouTube. Archived from the original on 20 December 2015. Retrieved 20 July 2014. {{cite web}}: Unknown parameter |deadurl= ignored (|url-status= suggested) (help)
  8. ^ Scopatz, Anthony; Huff, Kathryn D. (2015). Effective Computation in Physics. O'Reilly Media, Inc. p. 351. ISBN 9781491901595. Archived from the original on 7 May 2016. Retrieved 20 April 2016. {{cite book}}: Unknown parameter |deadurl= ignored (|url-status= suggested) (help)
  9. ^ a b Torvalds, Linus (7 April 2005). "Re: Kernel SCM saga." linux-kernel (Mailing list). {{cite mailing list}}: Unknown parameter |mailinglist= ignored (|mailing-list= suggested) (help) "So I'm writing some scripts to try to track things a whole lot faster."
  10. ^ a b Torvalds, Linus (10 June 2007). "Re: fatal: serious inflate inconsistency". git (Mailing list). {{cite mailing list}}: Unknown parameter |mailinglist= ignored (|mailing-list= suggested) (help)
  11. ^ a b c d Linus Torvalds (3 May 2007). Google tech talk: Linus Torvalds on git. Event occurs at 02:30. Archived from the original on 28 May 2007. Retrieved 16 May 2007. {{cite AV media}}: Unknown parameter |deadurl= ignored (|url-status= suggested) (help)
  12. ^ "A Short History of Git". Pro Git (2nd ed.). Apress. 2014. Archived from the original on 25 December 2015. Retrieved 26 December 2015. {{cite book}}: Unknown parameter |deadurl= ignored (|url-status= suggested) (help)
  13. ^ Chacon, Scott (24 December 2014). Pro Git (2nd ed.). New York, NY: Apress. pp. 29–30. ISBN 978-1-4842-0077-3. Archived from the original on 25 December 2015. {{cite book}}: Unknown parameter |deadurl= ignored (|url-status= suggested) (help)
  14. ^ BitKeeper and Linux: The end of the road? |linux.com Archived 8 June 2017 at the Wayback Machine
  15. ^ McAllister, Neil (2 May 2005). "Linus Torvalds' BitKeeper blunder". InfoWorld. IDG. Archived from the original on 26 August 2015. Retrieved 8 September 2015. {{cite news}}: Unknown parameter |deadurl= ignored (|url-status= suggested) (help)
  16. ^ a b Torvalds, Linus (27 February 2007). "Re: Trivia: When did git self-host?". git (Mailing list). {{cite mailing list}}: Unknown parameter |mailinglist= ignored (|mailing-list= suggested) (help)
  17. ^ Torvalds, Linus (6 April 2005). "Kernel SCM saga." linux-kernel (Mailing list). {{cite mailing list}}: Unknown parameter |mailinglist= ignored (|mailing-list= suggested) (help)
  18. ^ Torvalds, Linus (17 April 2005). "First ever real kernel git merge!". git (Mailing list). {{cite mailing list}}: Unknown parameter |mailinglist= ignored (|mailing-list= suggested) (help)
  19. ^ Mackall, Matt (29 April 2005). "Mercurial 0.4b vs git patchbomb benchmark". git (Mailing list). {{cite mailing list}}: Unknown parameter |mailinglist= ignored (|mailing-list= suggested) (help)
  20. ^ Torvalds, Linus (17 June 2005). "Linux 2.6.12". git-commits-head (Mailing list). {{cite mailing list}}: Unknown parameter |mailinglist= ignored (|mailing-list= suggested) (help)
  21. ^ Torvalds, Linus (27 July 2005). "Meet the new maintainer..." git (Mailing list). {{cite mailing list}}: Unknown parameter |mailinglist= ignored (|mailing-list= suggested) (help)
  22. ^ Hamano, Junio C. (21 December 2005). "Announce: Git 1.0.0". git (Mailing list). {{cite mailing list}}: Unknown parameter |mailinglist= ignored (|mailing-list= suggested) (help)
  23. ^ "GitFaq: Why the 'Git' name?". Git.or.cz. Archived from the original on 23 July 2012. Retrieved 14 July 2012. {{cite web}}: Unknown parameter |deadurl= ignored (|url-status= suggested) (help)
  24. ^ "After controversy, Torvalds begins work on 'git'". PC World. 14 July 2012. Archived from the original on 1 February 2011. Torvalds seemed aware that his decision to drop BitKeeper would also be controversial. When asked why he called the new software, "git", British slang meaning "a rotten person", he said. "I'm an egotistical bastard, so I name all my projects after myself. First Linux, now git" {{cite web}}: Unknown parameter |deadurl= ignored (|url-status= suggested) (help)
  25. ^ "git(1) Manual Page". Archived from the original on 21 June 2012. Retrieved 21 July 2012. {{cite web}}: Unknown parameter |deadurl= ignored (|url-status= suggested) (help)
  26. ^ "Initial revision of "git", the information manager from hell · git/git@e83c516". GitHub. Archived from the original on 8 October 2017. Retrieved 21 January 2016. {{cite web}}: Unknown parameter |deadurl= ignored (|url-status= suggested) (help)
  27. ^ Torvalds, Linus (5 May 2006). "Re: [ANNOUNCE] Git wiki". linux-kernel (Mailing list). {{cite mailing list}}: Unknown parameter |mailinglist= ignored (|mailing-list= suggested) (help) "Some historical background" on Git's predecessors
  28. ^ a b Torvalds, Linus (8 April 2005). "Re: Kernel SCM saga". linux-kernel (Mailing list). Retrieved 20 February 2008. {{cite mailing list}}: Unknown parameter |mailinglist= ignored (|mailing-list= suggested) (help)
  29. ^ a b Torvalds, Linus (23 March 2006). "Re: Errors GITtifying GCC and Binutils". git (Mailing list). {{cite mailing list}}: Unknown parameter |mailinglist= ignored (|mailing-list= suggested) (help)
  30. ^ Torvalds, Linus (20 October 2006). "Re: VCS comparison table". git (Mailing list). {{cite mailing list}}: Unknown parameter |mailinglist= ignored (|mailing-list= suggested) (help) A discussion of Git vs. BitKeeper
  31. ^ Git 2.8.0 Release Notes "Documentation/RelNotes/2.8.0.txt". 29 March 2016. Archived from the original on 26 July 2016. {{cite web}}: Unknown parameter |deadurl= ignored (|url-status= suggested) (help)
  32. ^ Torvalds, Linus (19 October 2006). "Re: VCS comparison table". git (Mailing list). {{cite mailing list}}: Unknown parameter |mailinglist= ignored (|mailing-list= suggested) (help)
  33. ^ Jst's Blog on Mozillazine "bzr/hg/git performance". Archived from the original on 29 May 2010. Retrieved 12 February 2015. {{cite web}}: Unknown parameter |deadurl= ignored (|url-status= suggested) (help)
  34. ^ Dreier, Roland (13 November 2006). "Oh what a relief it is". Archived from the original on 16 January 2009. {{cite web}}: Unknown parameter |deadurl= ignored (|url-status= suggested) (help), observing that "git log" is 100x faster than "svn log" because the latter must contact a remote server.
  35. ^ "Trust". Git Concepts. Git User's Manual. 18 October 2006. Archived from the original on 22 February 2017. {{cite web}}: Unknown parameter |deadurl= ignored (|url-status= suggested) (help)
  36. ^ Torvalds, Linus. "Re: VCS comparison table". git (Mailing list). Retrieved 10 April 2009. {{cite mailing list}}: Unknown parameter |mailinglist= ignored (|mailing-list= suggested) (help), describing Git's script-oriented design
  37. ^ iabervon (22 December 2005). "Git rocks!". Archived from the original on 14 September 2016. {{cite web}}: Unknown parameter |deadurl= ignored (|url-status= suggested) (help), praising Git's scriptability
  38. ^ "Git User's Manual". 5 August 2007. Archived from the original on 22 February 2017. {{cite web}}: Unknown parameter |deadurl= ignored (|url-status= suggested) (help)
  39. ^ Torvalds, Linus (10 April 2005). "Re: more git updates." linux-kernel (Mailing list). {{cite mailing list}}: Unknown parameter |mailinglist= ignored (|mailing-list= suggested) (help)
  40. ^ Haible, Bruno (11 February 2007). "how to speed up "git log"?". git (Mailing list). {{cite mailing list}}: Unknown parameter |mailinglist= ignored (|mailing-list= suggested) (help)
  41. ^ Torvalds, Linus (1 March 2006). "Re: impure renames / history tracking". git (Mailing list). {{cite mailing list}}: Unknown parameter |mailinglist= ignored (|mailing-list= suggested) (help)
  42. ^ Hamano, Junio C. (24 March 2006). "Re: Errors GITtifying GCC and Binutils". git (Mailing list). {{cite mailing list}}: Unknown parameter |mailinglist= ignored (|mailing-list= suggested) (help)
  43. ^ Hamano, Junio C. (23 March 2006). "Re: Errors GITtifying GCC and Binutils". git (Mailing list). {{cite mailing list}}: Unknown parameter |mailinglist= ignored (|mailing-list= suggested) (help)
  44. ^ Torvalds, Linus (28 November 2006). "Re: git and bzr". git (Mailing list). {{cite mailing list}}: Unknown parameter |mailinglist= ignored (|mailing-list= suggested) (help), on using git-blame to show code moved between source files
  45. ^ Torvalds, Linus (18 July 2007). "git-merge(1)". Archived from the original on 16 July 2016. {{cite web}}: Unknown parameter |deadurl= ignored (|url-status= suggested) (help)
  46. ^ Torvalds, Linus (18 July 2007). "CrissCrossMerge". Archived from the original on 13 January 2006. {{cite web}}: Unknown parameter |deadurl= ignored (|url-status= suggested) (help)
  47. ^ Torvalds, Linus (10 April 2005). "Re: more git updates..." linux-kernel (Mailing list). {{cite mailing list}}: Unknown parameter |mailinglist= ignored (|mailing-list= suggested) (help)
  48. ^ "1.4 Getting Started – Installing Git". git-scm.com. Archived from the original on 2 November 2013. Retrieved 1 November 2013. {{cite web}}: Unknown parameter |deadurl= ignored (|url-status= suggested) (help)
  49. ^ Gerrit Code Review – Project Configuration File Format
  50. ^ "downloads". Archived from the original on 8 May 2012. Retrieved 14 May 2012. {{cite web}}: Unknown parameter |deadurl= ignored (|url-status= suggested) (help)
  51. ^ "msysGit". Archived from the original on 10 October 2016. Retrieved 20 September 2016. {{cite web}}: Unknown parameter |deadurl= ignored (|url-status= suggested) (help)
  52. ^ "JGit". Archived from the original on 31 August 2012. Retrieved 24 August 2012. {{cite web}}: Unknown parameter |deadurl= ignored (|url-status= suggested) (help)
  53. ^ "Dulwich". Archived from the original on 29 May 2012. Retrieved 27 August 2012. {{cite web}}: Unknown parameter |deadurl= ignored (|url-status= suggested) (help)
  54. ^ "libgit2". Archived from the original on 11 April 2016. Retrieved 24 August 2012. {{cite web}}: Unknown parameter |deadurl= ignored (|url-status= suggested) (help)
  55. ^ "rugged". Archived from the original on 24 July 2013. Retrieved 24 August 2012. {{cite web}}: Unknown parameter |deadurl= ignored (|url-status= suggested) (help)
  56. ^ "pygit2". Archived from the original on 5 August 2015. Retrieved 24 August 2012. {{cite web}}: Unknown parameter |deadurl= ignored (|url-status= suggested) (help)
  57. ^ "hlibgit2". Archived from the original on 25 May 2013. Retrieved 30 April 2013. {{cite web}}: Unknown parameter |deadurl= ignored (|url-status= suggested) (help)
  58. ^ "Archived copy". Archived from the original on 7 August 2013. Retrieved 13 August 2013. {{cite web}}: Unknown parameter |deadurl= ignored (|url-status= suggested) (help)CS1 maint: archived copy as title (link) "js-git: a JavaScript implementation of Git." Retrieved 13 August 2013.
  59. ^ 4.4 Git on the Server – Setting Up the Server Archived 22 October 2014 at the Wayback Machine, Pro Git.
  60. ^ Diffusion User Guide: Repository Hosting
  61. ^ "Eclipse Community Survey 2014 results | Ian Skerrett". Ianskerrett.wordpress.com. 23 June 2014. Archived from the original on 25 June 2014. Retrieved 23 June 2014. {{cite web}}: Unknown parameter |deadurl= ignored (|url-status= suggested) (help)
  62. ^ "Results of Eclipse Community Survey 2012". Archived from the original on 11 April 2016. {{cite web}}: Unknown parameter |deadurl= ignored (|url-status= suggested) (help)
  63. ^ "Compare Repositories – Open Hub". Archived from the original on 7 September 2014. {{cite web}}: Unknown parameter |deadurl= ignored (|url-status= suggested) (help)
  64. ^ "Stack Overflow Developer Survey 2015". Stack Overflow. Archived from the original on 11 October 2016. Retrieved 1 October 2016. {{cite web}}: Unknown parameter |deadurl= ignored (|url-status= suggested) (help)
  65. ^ "Git (software) Jobs, Average Salary for Git Distributed Version Control System Skills". Itjobswatch.co.uk. Archived from the original on 8 October 2016. Retrieved 30 September 2016. {{cite web}}: Unknown parameter |deadurl= ignored (|url-status= suggested) (help)
  66. ^ "Team Foundation Server Jobs, Average Salary for Microsoft Team Foundation Server (TFS) Skills". Itjobswatch.co.uk. Archived from the original on 29 October 2016. Retrieved 30 September 2016. {{cite web}}: Unknown parameter |deadurl= ignored (|url-status= suggested) (help)
  67. ^ "Subversion Jobs, Average Salary for Apache Subversion (SVN) Skills". Itjobswatch.co.uk. Archived from the original on 25 October 2016. Retrieved 30 September 2016. {{cite web}}: Unknown parameter |deadurl= ignored (|url-status= suggested) (help)
  68. ^ "Mercurial Jobs, Average Salary for Mercurial Skills". Itjobswatch.co.uk. Archived from the original on 23 September 2016. Retrieved 30 September 2016. {{cite web}}: Unknown parameter |deadurl= ignored (|url-status= suggested) (help)
  69. ^ "VSS/SourceSafe Jobs, Average Salary for Microsoft Visual SourceSafe (VSS) Skills". Itjobswatch.co.uk. Archived from the original on 29 October 2016. Retrieved 30 September 2016. {{cite web}}: Unknown parameter |deadurl= ignored (|url-status= suggested) (help)
  70. ^ "Windows switch to Git almost complete: 8,500 commits and 1,760 builds each day". Ars Technica. Archived from the original on 24 May 2017. Retrieved 24 May 2017. {{cite web}}: Unknown parameter |deadurl= ignored (|url-status= suggested) (help)
  71. ^ "Archived copy". Archived from the original on 14 September 2016. Retrieved 6 September 2016. {{cite web}}: Unknown parameter |deadurl= ignored (|url-status= suggested) (help)CS1 maint: archived copy as title (link)
  72. ^ Pettersen, Tim (20 December 2014). "Securing your Git server against CVE-2014-9390". Archived from the original on 24 December 2014. Retrieved 22 December 2014. {{cite web}}: Unknown parameter |deadurl= ignored (|url-status= suggested) (help)
  73. ^ Hamano, J. C. (18 December 2014). "[Announce] Git v2.2.1 (and updates to older maintenance tracks)". Newsgroupgmane.linux.kernel. Archived from the original on 19 December 2014. Retrieved 22 December 2014. {{cite newsgroup}}: Unknown parameter |dead-url= ignored (|url-status= suggested) (help)
  74. ^ "CVE-2015-7545". 15 December 2015. Archived from the original on 26 December 2015. Retrieved 26 December 2015. {{cite web}}: Unknown parameter |deadurl= ignored (|url-status= suggested) (help)
  75. ^ "Git 2.6.1". 29 September 2015. Archived from the original on 11 April 2016. Retrieved 26 December 2015. {{cite web}}: Unknown parameter |deadurl= ignored (|url-status= suggested) (help)
  76. ^ a b c Blake Burkhart; et al. (5 October 2015). "Re: CVE Request: git". Archived from the original on 27 December 2015. Retrieved 26 December 2015. {{cite web}}: Unknown parameter |deadurl= ignored (|url-status= suggested) (help)
  77. ^ "hash - How safe are signed git tags? Only as safe as SHA-1 or somehow safer?". Information Security Stack Exchange. 22 September 2014. Archived from the original on 24 June 2016. {{cite web}}: Unknown parameter |deadurl= ignored (|url-status= suggested) (help)
  78. ^ "Why does Git use a cryptographic hash function?". Stack Overflow. 1 March 2015. Archived from the original on 1 July 2016. {{cite web}}: Unknown parameter |deadurl= ignored (|url-status= suggested) (help)