A fork of Git containing Microsoft-specific patches.

Перейти к файлу

Matheus Tavares 684dd4c2b4 checkout: fix bug that makes checkout follow symlinks in leading path Before checking out a file, we have to confirm that all of its leading components are real existing directories. And to reduce the number of lstat() calls in this process, we cache the last leading path known to contain only directories. However, when a path collision occurs (e.g. when checking out case-sensitive files in case-insensitive file systems), a cached path might have its file type changed on disk, leaving the cache on an invalid state. Normally, this doesn't bring any bad consequences as we usually check out files in index order, and therefore, by the time the cached path becomes outdated, we no longer need it anyway (because all files in that directory would have already been written). But, there are some users of the checkout machinery that do not always follow the index order. In particular: checkout-index writes the paths in the same order that they appear on the CLI (or stdin); and the delayed checkout feature -- used when a long-running filter process replies with "status=delayed" -- postpones the checkout of some entries, thus modifying the checkout order. When we have to check out an out-of-order entry and the lstat() cache is invalid (due to a previous path collision), checkout_entry() may end up using the invalid data and thrusting that the leading components are real directories when, in reality, they are not. In the best case scenario, where the directory was replaced by a regular file, the user will get an error: "fatal: unable to create file 'foo/bar': Not a directory". But if the directory was replaced by a symlink, checkout could actually end up following the symlink and writing the file at a wrong place, even outside the repository. Since delayed checkout is affected by this bug, it could be used by an attacker to write arbitrary files during the clone of a maliciously crafted repository. Some candidate solutions considered were to disable the lstat() cache during unordered checkouts or sort the entries before passing them to the checkout machinery. But both ideas include some performance penalty and they don't future-proof the code against new unordered use cases. Instead, we now manually reset the lstat cache whenever we successfully remove a directory. Note: We are not even checking whether the directory was the same as the lstat cache points to because we might face a scenario where the paths refer to the same location but differ due to case folding, precomposed UTF-8 issues, or the presence of `..` components in the path. Two regression tests, with case-collisions and utf8-collisions, are also added for both checkout-index and delayed checkout. Note: to make the previously mentioned clone attack unfeasible, it would be sufficient to reset the lstat cache only after the remove_subtree() call inside checkout_entry(). This is the place where we would remove a directory whose path collides with the path of another entry that we are currently trying to check out (possibly a symlink). However, in the interest of a thorough fix that does not leave Git open to similar-but-not-identical attack vectors, we decided to intercept all `rmdir()` calls in one fell swoop. This addresses CVE-2021-21300. Co-authored-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Matheus Tavares <matheus.bernardino@usp.br>		2021-02-12 15:47:02 +01:00
.github	Configure Git contribution guidelines for github.com	2017-06-13 08:41:47 -07:00
Documentation	Git 2.17.5	2020-04-19 16:10:58 -07:00
block-sha1	…
builtin	Sync with 2.16.6	2019-12-06 16:27:36 +01:00
ci	Merge branch 'tg/split-index-fixes' into maint	2018-03-22 14:24:10 -07:00
compat	checkout: fix bug that makes checkout follow symlinks in leading path	2021-02-12 15:47:02 +01:00
contrib	Merge branch 'nd/parseopt-completion'	2018-03-28 11:04:24 -07:00
ewah	Replace Free Software Foundation address in license notices	2017-11-09 13:21:21 +09:00
git-gui	Merge branch 'js/misc-git-gui-stuff' of ../git-gui	2018-01-09 11:07:03 -08:00
gitk-git	…
gitweb	gitweb: hard-depend on the Digest::MD5 5.8 module	2018-03-05 10:52:27 -08:00
mergetools	mergetools/meld: improve compatibiilty with Meld on macOS X	2017-06-18 22:11:29 -07:00
perl	Merge branch 'ab/perl-fixes'	2018-03-15 15:00:46 -07:00
po	l10n: de.po: translate 132 new messages	2018-03-31 13:21:09 +02:00
ppc	…
refs	Merge branch 'mr/packed-ref-store-fix' into maint	2018-03-22 14:24:10 -07:00
sha1collisiondetection@19d97bf5af	sha1dc: optionally use sha1collisiondetection as a submodule	2017-07-03 10:09:34 -07:00
sha1dc	Merge branch 'ab/sha1dc-maint'	2017-07-06 18:14:44 -07:00
t	checkout: fix bug that makes checkout follow symlinks in leading path	2021-02-12 15:47:02 +01:00
templates	fsmonitor: simplify determining the git worktree under Windows	2017-11-13 10:02:20 +09:00
vcs-svn	Merge branch 'jn/vcs-svn-cleanup' into maint	2017-09-10 17:03:09 +09:00
xdiff	Merge branch 'jt/diff-anchored-patience'	2017-12-19 11:33:56 -08:00
.clang-format	clang-format: adjust penalty for return type line break	2018-01-24 13:42:04 -08:00
.gitattributes	Fix build with core.autocrlf=true	2017-05-10 13:32:50 +09:00
.gitignore	…
.gitmodules	sha1dc: optionally use sha1collisiondetection as a submodule	2017-07-03 10:09:34 -07:00
.mailmap	mailmap: use Kaartic Sivaraam's new address	2017-11-03 23:00:07 +09:00
.travis.yml	travis-ci: build Git during the 'script' phase	2018-01-08 14:07:41 -08:00
.tsan-suppressions	ThreadSanitizer: add suppressions	2017-08-23 10:38:56 -07:00
COPYING	…
GIT-VERSION-GEN	Git 2.17.5	2020-04-19 16:10:58 -07:00
INSTALL	RelNotes: add details on Perl module changes	2018-03-16 16:07:37 -07:00
LGPL-2.1	…
Makefile	Merge branch 'ab/perl-fixes'	2018-03-15 15:00:46 -07:00
README.md	…
RelNotes	Git 2.17.5	2020-04-19 16:10:58 -07:00
abspath.c	real_path: clarify return value ownership	2017-09-27 09:13:47 +09:00
aclocal.m4	…
advice.c	Merge branch 'ls/editor-waiting-message'	2017-12-19 11:33:59 -08:00
advice.h	Merge branch 'ls/editor-waiting-message'	2017-12-19 11:33:59 -08:00
alias.c	Merge branch 'js/alias-case-sensitivity'	2017-07-20 16:29:59 -07:00
alloc.c	…
apply.c	Sync with Git 2.16.4	2018-05-22 14:25:26 +09:00
apply.h	apply: remove `newfd` from `struct apply_state`	2017-10-06 10:07:18 +09:00
archive-tar.c	Merge branch 'bw/config-h'	2017-06-24 14:28:41 -07:00
archive-zip.c	Merge branch 'bw/config-h'	2017-06-24 14:28:41 -07:00
archive.c	refs: convert dwim_ref and expand_ref to struct object_id	2017-10-16 11:05:51 +09:00
archive.h	timestamp_t: a new data type for timestamps	2017-04-27 13:07:39 +09:00
argv-array.c	…
argv-array.h	…
attr.c	hashmap: add API to disable item counting when threaded	2017-09-07 09:42:02 +09:00
attr.h	…
base85.c	…
bisect.c	Merge branch 'ys/bisect-object-id-missing-conversion-fix' into maint	2018-02-27 10:43:55 -08:00
bisect.h	Merge branch 'ma/bisect-leakfix'	2017-11-15 12:14:28 +09:00
blame.c	Merge branch 'bw/c-plus-plus'	2018-03-06 14:54:07 -08:00
blame.h	blame: move entry prepend to libgit	2017-05-25 13:08:23 +09:00
blob.c	Convert lookup_blob to struct object_id	2017-05-08 15:12:57 +09:00
blob.h	Convert lookup_blob to struct object_id	2017-05-08 15:12:57 +09:00
branch.c	Merge branch 'ks/branch-cleanup'	2017-12-27 11:16:25 -08:00
branch.h	Merge branch 'ks/branch-cleanup'	2017-12-27 11:16:25 -08:00
builtin.h	git.c: provide setup_auto_pager()	2017-08-03 11:08:10 -07:00
bulk-checkin.c	Merge branch 'bw/c-plus-plus'	2018-03-06 14:54:07 -08:00
bulk-checkin.h	…
bundle.c	Merge branch 'rs/lose-leak-pending' into maint	2018-02-15 15:18:11 -08:00
bundle.h	bundle: convert to struct object_id	2017-05-02 10:46:41 +09:00
cache-tree.c	Merge branch 'tg/split-index-fixes' into maint	2018-03-22 14:24:10 -07:00
cache-tree.h	Convert struct cache_tree to use struct object_id	2017-05-02 10:46:41 +09:00
cache.h	checkout: fix bug that makes checkout follow symlinks in leading path	2021-02-12 15:47:02 +01:00
check-builtins.sh	…
check-racy.c	…
check_bindir	…
checkout.c	checkout: factor out functions to new lib file	2017-11-27 09:48:06 +09:00
checkout.h	checkout: factor out functions to new lib file	2017-11-27 09:48:06 +09:00
color.c	color.h: document and modernize header	2018-02-13 10:17:12 -08:00
color.h	color.h: document and modernize header	2018-02-13 10:17:12 -08:00
column.c	column: do not include pager.c	2017-10-24 10:19:06 +09:00
column.h	…
combine-diff.c	Merge branch 'bw/c-plus-plus'	2018-03-06 14:54:07 -08:00
command-list.txt	…
commit-slab.h	commit-slab.h: avoid -Wsign-compare warnings	2017-09-22 13:00:36 +09:00
commit.c	Merge branch 'bw/c-plus-plus'	2018-03-06 14:54:07 -08:00
commit.h	Merge branch 'rs/lose-leak-pending' into maint	2018-02-15 15:18:11 -08:00
common-main.c	…
config.c	Merge branch 'tb/crlf-conv-flags'	2018-02-13 13:39:08 -08:00
config.h	Merge branch 'hm/config-parse-expiry-date'	2017-12-06 09:23:37 -08:00
config.mak.in	…
config.mak.uname	Sync with 2.15.4	2019-12-06 16:27:18 +01:00
configure.ac	Makefile: NO_OPENSSL=1 should no longer imply BLK_SHA1=1	2017-12-28 11:55:56 -08:00
connect.c	Sync with 2.15.4	2019-12-06 16:27:18 +01:00
connect.h	…
connected.c	Merge branch 'jh/partial-clone'	2018-02-13 13:39:04 -08:00
connected.h	Convert check_connected to use struct object_id	2017-10-16 11:05:50 +09:00
convert.c	Merge branch 'po/object-id'	2018-02-15 14:55:43 -08:00
convert.h	convert_to_git(): safe_crlf/checksafe becomes int conv_flags	2018-01-16 12:35:56 -08:00
copy.c	…
credential-cache--daemon.c	tempfile: auto-allocate tempfiles on heap	2017-09-06 17:19:54 +09:00
credential-cache.c	Merge branch 'dl/credential-cache-socket-in-xdg-cache' into maint	2017-08-23 14:33:45 -07:00
credential-store.c	path.c: and an option to call real_path() in expand_user_path()	2017-04-14 23:51:38 -07:00
credential.c	credential: treat URL with empty scheme as invalid	2020-04-19 16:10:58 -07:00
credential.h	credential: detect unrepresentable values when parsing urls	2020-03-12 02:55:24 -04:00
csum-file.c	csum-file: abstract uses of SHA-1	2018-02-02 11:28:41 -08:00
csum-file.h	csum-file: abstract uses of SHA-1	2018-02-02 11:28:41 -08:00
ctype.c	…
daemon.c	Merge branch 'lw/daemon-log-destination'	2018-02-21 12:45:04 -08:00
date.c	Merge branch 'ab/strbuf-addftime-tzname-boolify'	2017-07-06 18:14:47 -07:00
decorate.c	decorate: clean up and document API	2017-12-08 09:16:27 -08:00
decorate.h	decorate: clean up and document API	2017-12-08 09:16:27 -08:00
delta.h	…
diff-delta.c	Merge branch 'mk/diff-delta-avoid-large-offset'	2017-09-28 14:47:56 +09:00
diff-lib.c	Merge branch 'bw/c-plus-plus'	2018-03-06 14:54:07 -08:00
diff-no-index.c	diff: make struct diff_flags members lowercase	2017-11-01 11:51:40 +09:00
diff.c	Merge branch 'nd/diff-flush-before-warning' into maint	2018-03-22 14:24:09 -07:00
diff.h	Merge branch 'nd/diff-stat-with-summary'	2018-03-14 12:01:02 -07:00
diffcore-break.c	…
diffcore-delta.c	diffcore-delta: rename 'new' variables	2018-02-22 10:08:05 -08:00
diffcore-order.c	wildmatch: remove unused wildopts parameter	2017-06-23 18:27:07 -07:00
diffcore-pickaxe.c	diff: properly error out when combining multiple pickaxe options	2018-01-04 15:02:40 -08:00
diffcore-rename.c	Merge branch 'po/object-id'	2018-02-15 14:55:43 -08:00
diffcore.h	diff: convert fill_filespec to struct object_id	2017-06-02 09:36:07 +09:00
dir-iterator.c	…
dir-iterator.h	…
dir.c	Sync with Git 2.16.4	2018-05-22 14:25:26 +09:00
dir.h	Merge branch 'nd/fix-untracked-cache-invalidation'	2018-02-27 10:33:50 -08:00
editor.c	launch_editor(): indicate that Git waits for user input	2017-12-07 10:10:19 -08:00
entry.c	entry: rename 'new' variables	2018-02-22 10:08:05 -08:00
environment.c	Sync with 2.16.6	2019-12-06 16:27:36 +01:00
exec_cmd.c	git_extract_argv0_path: do nothing without RUNTIME_PREFIX	2017-09-07 09:41:14 +09:00
exec_cmd.h	…
fast-import.c	Sync with 2.16.6	2019-12-06 16:27:36 +01:00
fetch-object.c	unpack-trees: batch fetching of missing blobs	2017-12-08 09:58:51 -08:00
fetch-object.h	unpack-trees: batch fetching of missing blobs	2017-12-08 09:58:51 -08:00
fetch-pack.c	fetch-pack: do not check links for partial fetch	2018-03-15 10:16:27 -07:00
fetch-pack.h	fetch-pack, index-pack, transport: partial clone	2017-12-08 09:58:51 -08:00
fmt-merge-msg.h	…
fsck.c	fsck: reject URL with empty host in .gitmodules	2020-04-19 16:10:58 -07:00
fsck.h	fsck: detect gitmodules files	2018-05-21 23:55:12 -04:00
fsmonitor.c	dir.c: ignore paths containing .git when invalidating untracked cache	2018-02-07 12:27:02 -08:00
fsmonitor.h	dir.c: ignore paths containing .git when invalidating untracked cache	2018-02-07 12:27:02 -08:00
generate-cmdlist.sh	generate-cmdlist: avoid non-deterministic output	2017-11-22 14:56:30 +09:00
gettext.c	…
gettext.h	…
git-add--interactive.perl	Merge branch 'pw/add-p-single'	2018-04-02 10:10:55 -07:00
git-archimport.perl	archimport: use safe_pipe_capture for user input	2017-09-12 11:08:15 +09:00
git-bisect.sh	Merge branch 'sb/bisect-run-empty'	2017-11-15 12:14:36 +09:00
git-compat-util.h	checkout: fix bug that makes checkout follow symlinks in leading path	2021-02-12 15:47:02 +01:00
git-cvsexportcommit.perl	…
git-cvsimport.perl	perl: call timegm and timelocal with 4-digit year	2018-02-23 14:47:06 -08:00
git-cvsserver.perl	cvsserver: use safe_pipe_capture for `constant commands` as well	2017-09-11 14:52:29 +09:00
git-difftool--helper.sh	…
git-filter-branch.sh	filter-branch: use printf instead of echo -e	2018-03-19 10:59:28 -07:00
git-instaweb.sh	…
git-merge-octopus.sh	Merge branch 'ma/up-to-date'	2017-09-10 17:08:22 +09:00
git-merge-one-file.sh	scripts: use "git foo" not "git-foo"	2017-08-07 12:04:45 -07:00
git-merge-resolve.sh	scripts: use "git foo" not "git-foo"	2017-08-07 12:04:45 -07:00
git-mergetool--lib.sh	…
git-mergetool.sh	…
git-p4.py	git-p4: update multiple shelved change lists	2017-12-22 13:30:52 -08:00
git-parse-remote.sh	…
git-quiltimport.sh	…
git-rebase--am.sh	Merge branch 'nd/rebase-show-current-patch'	2018-03-06 14:54:02 -08:00
git-rebase--interactive.sh	Merge branch 'nd/rebase-show-current-patch'	2018-03-06 14:54:02 -08:00
git-rebase--merge.sh	Merge branch 'nd/rebase-show-current-patch'	2018-03-06 14:54:02 -08:00
git-rebase.sh	Merge branch 'nd/rebase-show-current-patch'	2018-03-06 14:54:02 -08:00
git-remote-testgit.sh	…
git-request-pull.sh	request-pull: capitalise "Git" to make it a proper noun	2017-10-03 13:11:57 +09:00
git-send-email.perl	Merge branch 'ab/perl-fixes'	2018-03-15 15:00:46 -07:00
git-sh-i18n.sh	git-sh-i18n: check GETTEXT_POISON before USE_GETTEXT_SCHEME	2018-02-08 10:09:45 -08:00
git-sh-setup.sh	…
git-stash.sh	Merge branch 'tg/stash-with-pathspec-fix' into maint	2018-02-15 15:18:13 -08:00
git-submodule.sh	Sync with 2.16.6	2019-12-06 16:27:36 +01:00
git-svn.perl	Merge branch 'ew/svn-branch-segfault-fix' into maint	2018-03-22 14:24:11 -07:00
git-web--browse.sh	…
git.c	Merge branch 'ma/config-page-only-in-list-mode'	2018-03-21 11:30:09 -07:00
git.rc	mingw: include the full version information in the resources	2017-11-01 13:43:52 +09:00
gpg-interface.c	tempfile: auto-allocate tempfiles on heap	2017-09-06 17:19:54 +09:00
gpg-interface.h	…
graph.c	graph: use strbuf_addchars() to add spaces	2017-10-02 13:14:07 +09:00
graph.h	…
grep.c	color.h: document and modernize header	2018-02-13 10:17:12 -08:00
grep.h	Merge branch 'ab/pcre-v2' into maint	2017-11-21 14:05:30 +09:00
hash.h	hash: update obsolete reference to SHA1_HEADER	2018-02-09 09:56:10 -08:00
hashmap.c	hashmap: add API to disable item counting when threaded	2017-09-07 09:42:02 +09:00
hashmap.h	Merge branch 'rb/hashmap-h-compilation-fix' into maint	2018-03-22 14:24:15 -07:00
help.c	version --build-options: report commit, too, if possible	2017-12-14 22:53:04 -08:00
help.h	…
hex.c	notes: move hex_to_bytes() to hex.c and export it	2017-11-01 10:35:35 +09:00
http-backend.c	Merge branch 'rs/resolve-ref-optional-result'	2017-09-28 14:47:56 +09:00
http-fetch.c	config: don't include config.h by default	2017-06-15 12:56:22 -07:00
http-push.c	Merge branch 'bw/c-plus-plus'	2018-03-06 14:54:07 -08:00
http-walker.c	sha1_file: remove static strbuf from sha1_file_name()	2018-01-17 12:21:32 -08:00
http.c	credential: parse URL without host as empty host, not unset	2020-04-19 16:10:57 -07:00
http.h	http.postbuffer: allow full range of ssize_t values	2017-04-13 18:24:32 -07:00
ident.c	Merge branch 'bw/config-h'	2017-06-24 14:28:41 -07:00
imap-send.c	imap-send: rename 'new' variables	2018-02-22 10:08:05 -08:00
iterator.h	…
khash.h	…
kwset.c	Replace Free Software Foundation address in license notices	2017-11-09 13:21:21 +09:00
kwset.h	Replace Free Software Foundation address in license notices	2017-11-09 13:21:21 +09:00
levenshtein.c	…
levenshtein.h	…
line-log.c	line-log: rename 'new' variables	2018-02-22 10:08:05 -08:00
line-log.h	ALLOC_GROW: avoid -Wsign-compare warnings	2017-09-22 13:21:11 +09:00
line-range.c	…
line-range.h	…
list-objects-filter-options.c	fetch: inherit filter-spec from partial clone	2017-12-08 09:58:52 -08:00
list-objects-filter-options.h	fetch: inherit filter-spec from partial clone	2017-12-08 09:58:52 -08:00
list-objects-filter.c	list-objects: filter objects in traverse_commit_list	2017-11-22 14:11:57 +09:00
list-objects-filter.h	list-objects: filter objects in traverse_commit_list	2017-11-22 14:11:57 +09:00
list-objects.c	Merge branch 'jh/fsck-promisors'	2018-02-13 13:39:03 -08:00
list-objects.h	list-objects: filter objects in traverse_commit_list	2017-11-22 14:11:57 +09:00
list.h	tempfile: use list.h for linked list	2017-09-06 17:19:54 +09:00
ll-merge.c	avoid "write_in_full(fd, buf, len) != len" pattern	2017-09-14 15:17:59 +09:00
ll-merge.h	…
lockfile.c	tempfile: auto-allocate tempfiles on heap	2017-09-06 17:19:54 +09:00
lockfile.h	lockfile: fix documentation on `close_lock_file_gently()`	2017-10-06 10:07:17 +09:00
log-tree.c	Merge branch 'bw/c-plus-plus'	2018-03-06 14:54:07 -08:00
log-tree.h	log: add option to choose which refs to decorate	2017-11-22 13:18:59 +09:00
mailinfo.c	Merge branch 'jc/mailinfo-cleanup-fix' into maint	2018-03-22 14:24:16 -07:00
mailinfo.h	…
mailmap.c	Convert remaining callers of get_sha1 to get_oid.	2017-07-17 13:54:51 -07:00
mailmap.h	…
match-trees.c	sha1_file: convert write_sha1_file to object_id	2018-01-30 10:42:36 -08:00
merge-blobs.c	…
merge-blobs.h	…
merge-recursive.c	Merge branch 'rj/warning-uninitialized-fix'	2018-03-21 11:30:15 -07:00
merge-recursive.h	merge-recursive: change current file dir string_lists to hashmap	2017-09-08 10:36:16 +09:00
merge.c	merge: always roll back lock in `checkout_fast_forward()`	2018-02-28 11:15:51 -08:00
mergesort.c	…
mergesort.h	…
name-hash.c	Merge branch 'bp/name-hash-dirname-fix'	2018-02-27 10:33:53 -08:00
notes-cache.c	sha1_file: convert write_sha1_file to object_id	2018-01-30 10:42:36 -08:00
notes-cache.h	notes-cache: convert to struct object_id	2017-05-08 15:12:57 +09:00
notes-merge.c	commit: convert commit_tree* to object_id	2018-01-30 10:42:36 -08:00
notes-merge.h	notes-merge: convert notes_merge* to struct object_id	2017-06-05 11:23:58 +09:00
notes-utils.c	notes: convert write_notes_tree to object_id	2018-01-30 10:42:36 -08:00
notes-utils.h	commit: convert commit_tree* to object_id	2018-01-30 10:42:36 -08:00
notes.c	sha1_file: convert write_sha1_file to object_id	2018-01-30 10:42:36 -08:00
notes.h	notes: convert write_notes_tree to object_id	2018-01-30 10:42:36 -08:00
object.c	Merge branch 'bw/c-plus-plus'	2018-03-06 14:54:07 -08:00
object.h	Merge branch 'nd/object-allocation-comments'	2018-03-14 12:01:06 -07:00
oidmap.c	oidmap: ensure map is initialized	2017-12-27 12:28:06 -08:00
oidmap.h	oidmap: add oidmap iterator methods	2017-11-22 14:11:56 +09:00
oidset.c	oidset: add iterator methods to oidset	2017-11-22 14:11:56 +09:00
oidset.h	oidset: don't return value from oidset_init	2018-01-08 15:24:35 -08:00
pack-bitmap-write.c	csum-file: rename sha1file to hashfile	2018-02-02 11:28:41 -08:00
pack-bitmap.c	pack-bitmap: convert traverse_bitmap_commit_list to object_id	2017-10-16 11:05:51 +09:00
pack-bitmap.h	pack-bitmap: convert traverse_bitmap_commit_list to object_id	2017-10-16 11:05:51 +09:00
pack-check.c	Merge branch 'bw/c-plus-plus'	2018-03-06 14:54:07 -08:00
pack-objects.c	pack: convert struct pack_idx_entry to struct object_id	2017-05-08 15:12:57 +09:00
pack-objects.h	…
pack-revindex.c	packfile: use get_be64() for large offsets	2018-01-19 11:04:56 -08:00
pack-revindex.h	…
pack-write.c	csum-file: rename sha1file to hashfile	2018-02-02 11:28:41 -08:00
pack.h	csum-file: rename sha1file to hashfile	2018-02-02 11:28:41 -08:00
packfile.c	Merge branch 'bw/c-plus-plus'	2018-03-06 14:54:07 -08:00
packfile.h	fsck: introduce partialclone extension	2017-12-05 09:46:05 -08:00
pager.c	Merge branch 'ma/parse-maybe-bool'	2017-08-22 10:29:03 -07:00
parse-options-cb.c	Merge branch 'bc/object-id'	2017-05-29 12:34:43 +09:00
parse-options.c	Merge branch 'nd/parseopt-completion'	2018-03-14 12:01:07 -07:00
parse-options.h	completion: don't set PARSE_OPT_NOCOMPLETE on --rerere-autoupdate	2018-03-07 11:02:48 -08:00
patch-delta.c	…
patch-ids.c	diff: make struct diff_flags members lowercase	2017-11-01 11:51:40 +09:00
patch-ids.h	patch-ids: convert to struct object_id	2017-06-02 09:36:07 +09:00
path.c	Sync with 2.14.6	2019-12-06 16:26:55 +01:00
path.h	path: document path functions	2017-12-13 11:14:25 -08:00
pathspec.c	Merge branch 'ex/deprecate-empty-pathspec-as-match-all'	2017-11-06 13:11:29 +09:00
pathspec.h	Merge branch 'bw/pathspec-match-submodule-boundary'	2017-12-19 11:33:56 -08:00
pkt-line.c	Merge branch 'bw/protocol-v1'	2017-12-06 09:23:44 -08:00
pkt-line.h	pkt-line: add packet_write function	2017-10-17 10:51:29 +09:00
preload-index.c	trace: measure where the time is spent in the index-heavy operations	2018-02-02 11:20:16 -08:00
pretty.c	log: add option to choose which refs to decorate	2017-11-22 13:18:59 +09:00
pretty.h	format: create docs for pretty.h	2017-12-12 10:41:15 -08:00
prio-queue.c	*.[ch] refactoring: make use of the FREE_AND_NULL() macro	2017-06-16 12:44:09 -07:00
prio-queue.h	…
progress.c	Merge branch 'en/rename-progress'	2017-12-19 11:33:55 -08:00
progress.h	progress: fix progress meters when dealing with lots of work	2017-11-15 13:11:25 +09:00
prompt.c	config: don't include config.h by default	2017-06-15 12:56:22 -07:00
prompt.h	…
protocol.c	protocol: introduce protocol extension mechanisms	2017-10-17 10:51:29 +09:00
protocol.h	protocol: introduce protocol extension mechanisms	2017-10-17 10:51:29 +09:00
quote.c	Merge branch 'jk/sq-dequote-on-bogus-input'	2018-02-27 10:34:02 -08:00
quote.h	trace: avoid unnecessary quoting	2018-01-16 12:16:54 -08:00
reachable.c	object: rename function 'typename' to 'type_name'	2018-02-14 13:10:05 -08:00
reachable.h	timestamp_t: a new data type for timestamps	2017-04-27 13:07:39 +09:00
read-cache.c	Sync with 2.16.6	2019-12-06 16:27:36 +01:00
ref-filter.c	Merge branch 'ot/ref-filter-cleanup'	2018-03-08 12:36:24 -08:00
ref-filter.h	ref-filter: consult want_color() before emitting colors	2017-07-13 12:42:51 -07:00
reflog-walk.c	refs: convert dwim_log to struct object_id	2017-10-16 11:05:51 +09:00
reflog-walk.h	reflog-walk: apply --since/--until to reflog dates	2017-07-09 10:00:48 -07:00
refs.c	log: add option to choose which refs to decorate	2017-11-22 13:18:59 +09:00
refs.h	log: add option to choose which refs to decorate	2017-11-22 13:18:59 +09:00
remote-curl.c	Merge branch 'jk/push-options-via-transport-fix'	2018-02-28 13:37:58 -08:00
remote-testsvn.c	refs: convert read_ref and read_ref_full to object_id	2017-10-16 11:05:50 +09:00
remote.c	Merge branch 'jh/status-no-ahead-behind'	2018-03-08 12:36:24 -08:00
remote.h	Merge branch 'jh/status-no-ahead-behind'	2018-03-08 12:36:24 -08:00
replace_object.c	Use MOVE_ARRAY	2018-01-22 11:32:51 -08:00
repository.c	Merge branch 'tg/split-index-fixes' into maint	2018-03-22 14:24:10 -07:00
repository.h	Integrate hash algorithm support with repo setup	2017-11-13 13:20:44 +09:00
rerere.c	write_locked_index(): add flag to avoid writing unchanged index	2018-03-01 13:28:01 -08:00
rerere.h	completion: don't set PARSE_OPT_NOCOMPLETE on --rerere-autoupdate	2018-03-07 11:02:48 -08:00
resolve-undo.c	…
resolve-undo.h	…
revision.c	Merge branch 'jk/cached-commit-buffer' into maint	2018-03-22 14:24:25 -07:00
revision.h	Merge branch 'jk/cached-commit-buffer'	2018-03-06 14:54:05 -08:00
run-command.c	run-command.c: print new cwd in trace_run_command()	2018-01-19 10:49:20 -08:00
run-command.h	run-command: expose is_executable function	2017-04-25 18:45:29 -07:00
send-pack.c	always check for NULL return from packet_read_line()	2018-02-08 12:37:40 -08:00
send-pack.h	Rename sha1_array to oid_array	2017-03-31 08:33:56 -07:00
sequencer.c	Merge branch 'ma/skip-writing-unchanged-index'	2018-03-21 11:30:10 -07:00
sequencer.h	Merge branch 'pw/sequencer-in-process-commit'	2018-02-13 13:39:15 -08:00
server-info.c	pack: move {,re}prepare_packed_git and approximate_object_count	2017-08-23 15:12:07 -07:00
setup.c	Merge branch 'as/ll-i18n'	2018-02-27 10:33:58 -08:00
sh-i18n--envsubst.c	Replace Free Software Foundation address in license notices	2017-11-09 13:21:21 +09:00
sha1-array.c	coccinelle: make use of the "type" FREE_AND_NULL() rule	2017-06-16 12:44:03 -07:00
sha1-array.h	Rename sha1_array to oid_array	2017-03-31 08:33:56 -07:00
sha1-lookup.c	packfile: refactor hash search with fanout table	2018-02-15 13:08:55 -08:00
sha1-lookup.h	packfile: refactor hash search with fanout table	2018-02-15 13:08:55 -08:00
sha1_file.c	fsck: actually fsck blob data	2018-05-21 23:55:12 -04:00
sha1_name.c	Merge branch 'ds/find-unique-abbrev-optim'	2018-03-08 12:36:26 -08:00
sha1dc_git.c	sha1dc: allow building with the external sha1dc library	2017-08-16 14:44:25 -07:00
sha1dc_git.h	sha1dc_git.h: re-arrange an ifdef chain for a subsequent change	2017-12-08 15:01:01 -08:00
shallow.c	Merge branch 'ma/leakplugs'	2017-09-29 11:23:43 +09:00
shell.c	shell: drop git-cvsserver support by default	2017-09-12 11:05:58 +09:00
shortlog.h	…
show-index.c	…
sideband.c	refactor "dumb" terminal determination	2017-12-04 09:38:30 -08:00
sideband.h	…
sigchain.c	…
sigchain.h	…
split-index.c	Merge branch 'bw/c-plus-plus'	2018-03-06 14:54:07 -08:00
split-index.h	split-index: rename 'new' variables	2018-02-22 10:08:05 -08:00
strbuf.c	Merge branch 'nd/worktree-move'	2018-03-14 12:01:05 -07:00
strbuf.h	worktree move: accept destination as directory	2018-02-12 13:13:35 -08:00
streaming.c	Merge branch 'jk/write-in-full-fix'	2017-09-25 15:24:06 +09:00
streaming.h	…
string-list.c	cleanup: fix possible overflow errors in binary search	2017-10-10 08:57:24 +09:00
string-list.h	string-list.h: move documentation from Documentation/api/ into header	2017-09-27 09:14:34 +09:00
sub-process.c	Merge branch 'cc/subprocess-handshake-missing-capabilities' into maint	2017-10-18 14:19:10 +09:00
sub-process.h	Docs: split out long-running subprocess handshake	2018-01-25 11:24:32 -08:00
submodule-config.c	Sync with 2.15.4	2019-12-06 16:27:18 +01:00
submodule-config.h	Sync with Git 2.15.2	2018-05-22 14:18:06 +09:00
submodule.c	Sync with 2.16.6	2019-12-06 16:27:36 +01:00
submodule.h	Sync with 2.16.6	2019-12-06 16:27:36 +01:00
symlinks.c	checkout: fix bug that makes checkout follow symlinks in leading path	2021-02-12 15:47:02 +01:00
tag.c	object: rename function 'typename' to 'type_name'	2018-02-14 13:10:05 -08:00
tag.h	tag: convert gpg_verify_tag to use struct object_id	2017-07-13 12:02:48 -07:00
tar.h	…
tempfile.c	tempfile: rename 'template' variables	2018-02-22 10:08:05 -08:00
tempfile.h	tempfile: rename 'template' variables	2018-02-22 10:08:05 -08:00
thread-utils.c	…
thread-utils.h	…
tmp-objdir.c	…
tmp-objdir.h	…
trace.c	trace.c: move strbuf_release() out of print_trace_line()	2018-01-16 12:16:54 -08:00
trace.h	trace: improve performance while category is disabled	2017-12-06 09:43:02 -08:00
trailer.c	trailer: rename 'template' variables	2018-02-22 10:08:05 -08:00
trailer.h	Merge branch 'jk/trailers-parse'	2017-08-26 22:55:04 -07:00
transport-helper.c	Sync with 2.16.6	2019-12-06 16:27:36 +01:00
transport-internal.h	transport: make transport vtable more private	2017-12-14 14:28:04 -08:00
transport.c	Merge branch 'jh/partial-clone'	2018-02-13 13:39:04 -08:00
transport.h	Merge branch 'jh/partial-clone'	2018-02-13 13:39:04 -08:00
tree-diff.c	diff: make struct diff_flags members lowercase	2017-11-01 11:51:40 +09:00
tree-walk.c	Sync with 2.15.4	2019-12-06 16:27:18 +01:00
tree-walk.h	tree-walk: convert fill_tree_descriptor() to object_id	2017-08-14 12:38:54 -07:00
tree.c	Merge branch 'ab/free-and-null'	2017-06-24 14:28:41 -07:00
tree.h	tree: convert read_tree to take an index parameter	2017-06-13 11:40:51 -07:00
unicode_width.h	unicode: update the width tables to Unicode 10	2017-07-07 10:33:30 -07:00
unimplemented.sh	…
unix-socket.c	…
unix-socket.h	…
unpack-trees.c	Sync with 2.16.6	2019-12-06 16:27:36 +01:00
unpack-trees.h	…
upload-pack.c	Merge branch 'jh/partial-clone'	2018-03-29 15:39:59 -07:00
url.c	…
url.h	…
urlmatch.c	urlmatch: use hex2chr() in append_normalized_escapes()	2017-07-09 09:43:01 -07:00
urlmatch.h	…
usage.c	add UNLEAK annotation for reducing leak false positives	2017-09-08 15:43:17 +09:00
userdiff.c	Merge branch 'tl/userdiff-csharp-async'	2018-03-15 15:00:47 -07:00
userdiff.h	…
utf8.c	Sync with Git 2.14.4	2018-05-22 14:15:14 +09:00
utf8.h	is_hfs_dotgit: match other .git files	2018-05-21 23:50:11 -04:00
varint.c	…
varint.h	…
version.c	version --build-options: report commit, too, if possible	2017-12-14 22:53:04 -08:00
version.h	version --build-options: report commit, too, if possible	2017-12-14 22:53:04 -08:00
versioncmp.c	config: don't include config.h by default	2017-06-15 12:56:22 -07:00
walker.c	object: rename function 'typename' to 'type_name'	2018-02-14 13:10:05 -08:00
walker.h	…
wildmatch.c	wildmatch: remove unused wildopts parameter	2017-06-23 18:27:07 -07:00
wildmatch.h	wildmatch: remove unused wildopts parameter	2017-06-23 18:27:07 -07:00
worktree.c	worktree remove: allow it when $GIT_WORK_TREE is already gone	2018-02-12 13:13:35 -08:00
worktree.h	worktree remove: allow it when $GIT_WORK_TREE is already gone	2018-02-12 13:13:35 -08:00
wrap-for-bin.sh	Makefile: replace perl/Makefile.PL with simple make rules	2017-12-11 15:28:10 -08:00
wrapper.c	wrapper: rename 'template' variables	2018-02-22 10:08:05 -08:00
write_or_die.c	…
ws.c	…
wt-status.c	Merge branch 'jh/status-no-ahead-behind'	2018-03-08 12:36:24 -08:00
wt-status.h	Merge branch 'jh/status-no-ahead-behind'	2018-03-08 12:36:24 -08:00
xdiff-interface.c	xdiff-interface: export comparing and hashing strings	2017-10-26 11:23:22 +09:00
xdiff-interface.h	xdiff-interface: export comparing and hashing strings	2017-10-26 11:23:22 +09:00
zlib.c	…

README.md

Git - fast, scalable, distributed revision control system

Git is a fast, scalable, distributed revision control system with an unusually rich command set that provides both high-level operations and full access to internals.

Git is an Open Source project covered by the GNU General Public License version 2 (some parts of it are under different licenses, compatible with the GPLv2). It was originally written by Linus Torvalds with help of a group of hackers around the net.

Please read the file INSTALL for installation instructions.

Many Git online resources are accessible from https://git-scm.com/ including full documentation and Git related tools.

See Documentation/gittutorial.txt to get started, then see Documentation/giteveryday.txt for a useful minimum set of commands, and Documentation/git-.txt for documentation of each command. If git has been correctly installed, then the tutorial can also be read with man gittutorial or git help tutorial, and the documentation of each command with man git-<commandname> or git help <commandname>.

CVS users may also want to read Documentation/gitcvs-migration.txt (man gitcvs-migration or git help cvs-migration if git is installed).

The user discussion and development of Git take place on the Git mailing list -- everyone is welcome to post bug reports, feature requests, comments and patches to git@vger.kernel.org (read Documentation/SubmittingPatches for instructions on patch submission). To subscribe to the list, send an email with just "subscribe git" in the body to majordomo@vger.kernel.org. The mailing list archives are available at https://public-inbox.org/git/, http://marc.info/?l=git and other archival sites.

The maintainer frequently sends the "What's cooking" reports that list the current status of various development topics to the mailing list. The discussion following them give a good reference for project status, development direction and remaining tasks.

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 mood):

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