Git with broken hash generation to generate collisions between object IDs. Don't use this! https://undefinedbehavior.de/posts/commit-vandalism/
Go to file
Nguyễn Thái Ngọc Duy 836ef2b69f unpack-trees: reuse (still valid) cache-tree from src_index
We do n-way merge by walking the source index and n trees at the same
time and add merge results to a new temporary index called o->result.
The merge result for any given path could be either

- keep_entry(): same old index entry in o->src_index is reused
- merged_entry(): either a new entry is added, or an existing one updated
- deleted_entry(): one entry from o->src_index is removed

For some reason [1] we keep making sure that the source index's
cache-tree is still valid if used by o->result: for all those
merged/deleted entries, we invalidate the same path in o->src_index,
so only cache-trees covering the "keep_entry" parts remain good.

Because of this, the cache-tree from o->src_index can be perfectly
reused in o->result. And in fact we already rely on this logic to
reuse untracked cache in edf3b90553 (unpack-trees: preserve index
extensions - 2017-05-08). Move the cache-tree to o->result before
doing cache_tree_update() to reduce hashing cost.

Since cache_tree_update() has risen up as one of the most expensive
parts in unpack_trees() after the last few patches. This does help
reduce unpack_trees() time significantly (on webkit.git):

    before       after
  --------------------------------------------------------------------
    0.080394752  0.051258167 s:  read cache .git/index
    0.216010838  0.212106298 s:  preload index
    0.008534301  0.280521764 s:  refresh index
    0.251992198  0.218160442 s:   traverse_trees
    0.377031383  0.374948191 s:   check_updates
    0.372768105  0.037040114 s:   cache_tree_update
    1.045887251  0.672031609 s:  unpack_trees
    0.314983512  0.317456290 s:  write index, changed mask = 2e
    0.062572653  0.038382654 s:    traverse_trees
    0.000022544  0.000042731 s:    check_updates
    0.073795585  0.050930053 s:   unpack_trees
    0.073807557  0.051099735 s:  diff-index
    1.938191592  1.614241153 s: git command: git checkout -

[1] I'm pretty sure the reason is an oversight in 34110cd4e3 (Make
    'unpack_trees()' have a separate source and destination index -
    2008-03-06). That patch aims to _not_ update the source index at
    all. The invalidation should have been done on o->result in that
    patch. But then there was no cache-tree on o->result even then so
    it's pointless to do so.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2018-08-18 09:47:46 -07:00
.github Configure Git contribution guidelines for github.com 2017-06-13 08:41:47 -07:00
block-sha1 sha1: provide another level of indirection for the SHA-1 functions 2015-11-05 10:35:11 -08:00
builtin Merge branch 'js/pull-rebase-type-shorthand' 2018-08-17 13:09:59 -07:00
ci Merge branch 'sg/travis-retrieve-trash-upon-failure' 2018-08-15 15:08:28 -07:00
compat Merge branch 'nd/command-list' 2018-07-24 14:50:50 -07:00
contrib Merge branch 'es/mw-to-git-chain-fix' 2018-08-15 15:08:27 -07:00
Documentation Seventh batch for 2.19 cycle 2018-08-17 13:15:06 -07:00
ewah ewah: delete unused 'rlwit_discharge_empty()' 2018-06-21 09:39:48 -07:00
git-gui Merge branch 'cb/git-gui-ttk-style' 2018-04-25 13:28:49 +09:00
gitk-git
gitweb gitweb: hard-depend on the Digest::MD5 5.8 module 2018-03-05 10:52:27 -08:00
mergetools mergetools: add support for guiffy 2018-04-06 08:11:39 +09:00
negotiator Merge branch 'jt/fetch-negotiator-skipping' 2018-08-02 15:30:46 -07:00
perl Merge branch 'ab/git-svn-get-record-typofix' 2018-05-08 15:59:28 +09:00
po l10n: ko.po: Update Korean translation 2018-06-19 02:19:42 +09:00
ppc
refs Merge branch 'jk/size-t' 2018-08-15 15:08:25 -07:00
sha1collisiondetection@232357eb2e sha1dc: update from upstream 2018-08-02 13:54:58 -07:00
sha1dc sha1dc: update from upstream 2018-08-02 13:54:58 -07:00
t Merge branch 'ar/t4150-am-scissors-test-fix' 2018-08-17 13:09:59 -07:00
templates Update shell scripts to compute empty tree object ID 2018-05-02 13:59:53 +09:00
vcs-svn Convert remaining die*(BUG) messages 2018-05-06 19:06:14 +09:00
xdiff Merge branch 'sb/indent-heuristic-optim' 2018-08-17 13:09:57 -07:00
.clang-format clang-format: adjust penalty for return type line break 2018-01-24 13:42:04 -08:00
.gitattributes .gitattributes: add a diff driver for Python 2018-04-27 09:18:55 +09:00
.gitignore contrib: add a script to initialize VS Code configuration 2018-07-30 13:14:38 -07:00
.gitmodules sha1dc: optionally use sha1collisiondetection as a submodule 2017-07-03 10:09:34 -07:00
.mailmap .mailmap: merge different spellings of names 2018-06-29 09:29:44 -07:00
.travis.yml travis-ci: run gcc-8 on linux-gcc jobs 2018-05-21 14:14:09 +09:00
.tsan-suppressions ThreadSanitizer: add suppressions 2017-08-23 10:38:56 -07:00
abspath.c real_path: clarify return value ownership 2017-09-27 09:13:47 +09:00
aclocal.m4
advice.c Merge branch 'ab/checkout-default-remote' 2018-08-02 15:30:41 -07:00
advice.h Merge branch 'ab/checkout-default-remote' 2018-08-02 15:30:41 -07:00
alias.c completion: add and use --list-cmds=alias 2018-05-21 13:23:14 +09:00
alias.h completion: add and use --list-cmds=alias 2018-05-21 13:23:14 +09:00
alloc.c Merge branch 'sb/object-store-alloc' 2018-06-25 13:22:38 -07:00
alloc.h alloc: allow arbitrary repositories for alloc functions 2018-05-16 11:16:50 +09:00
apply.c Merge branch 'jm/cache-entry-from-mem-pool' 2018-08-02 15:30:43 -07:00
apply.h apply.h: drop extern on func declaration 2018-08-03 10:42:51 -07:00
archive-tar.c Merge branch 'nd/i18n' 2018-08-15 15:08:23 -07:00
archive-zip.c Merge branch 'nd/i18n' 2018-08-15 15:08:23 -07:00
archive.c Merge branch 'sb/object-store-grafts' 2018-07-18 12:20:28 -07:00
archive.h archive: convert sha1_file_to_archive to struct object_id 2018-03-14 09:23:48 -07:00
argv-array.c Merge branch 'ma/unpack-trees-free-msgs' 2018-05-30 21:51:29 +09:00
argv-array.h Merge branch 'ma/unpack-trees-free-msgs' 2018-05-30 21:51:29 +09:00
attr.c Replace all die("BUG: ...") calls by BUG() ones 2018-05-06 19:06:13 +09:00
attr.h attr.h: drop extern from function declaration 2018-08-03 10:42:51 -07:00
banned.h banned.h: mark strncpy() as banned 2018-07-26 10:12:51 -07:00
base85.c
bisect.c commit: add repository argument to lookup_commit_reference 2018-06-29 10:43:39 -07:00
bisect.h Merge branch 'ma/bisect-leakfix' 2017-11-15 12:14:28 +09:00
blame.c Merge branch 'jm/cache-entry-from-mem-pool' 2018-08-02 15:30:43 -07:00
blame.h blame.h: drop extern on func declaration 2018-08-03 10:42:54 -07:00
blob.c blob: allow lookup_blob to handle arbitrary repositories 2018-06-29 10:43:39 -07:00
blob.h blob: allow lookup_blob to handle arbitrary repositories 2018-06-29 10:43:39 -07:00
branch.c Merge branch 'sb/object-store-grafts' 2018-07-18 12:20:28 -07:00
branch.h Merge branch 'ks/branch-cleanup' 2017-12-27 11:16:25 -08:00
builtin.h Merge branch 'jk/show-index' 2018-06-25 13:22:37 -07:00
bulk-checkin.c Merge branch 'sb/object-store-grafts' 2018-07-18 12:20:28 -07:00
bulk-checkin.h bulk-checkin: convert index_bulk_checkin to struct object_id 2018-03-14 09:23:47 -07:00
bundle.c Merge branch 'sb/object-store-grafts' 2018-07-18 12:20:28 -07:00
bundle.h
cache-tree.c unpack-trees: add performance tracing 2018-08-18 09:47:46 -07:00
cache-tree.h cache-tree.h: drop extern from function declaration 2018-08-03 10:42:54 -07:00
cache.h Merge branch 'js/vscode' 2018-08-15 15:08:26 -07:00
chdir-notify.c add chdir-notify API 2018-03-30 12:49:57 -07:00
chdir-notify.h add chdir-notify API 2018-03-30 12:49:57 -07:00
check_bindir
check-builtins.sh
check-racy.c
checkout.c checkout & worktree: introduce checkout.defaultRemote 2018-06-11 09:41:02 -07:00
checkout.h checkout: pass the "num_matches" up to callers 2018-06-11 09:41:01 -07:00
color.c color: protect against out-of-bounds reads and writes 2018-08-03 08:52:05 -07:00
color.h color: introduce support for colorizing stderr 2018-04-24 10:38:47 +09:00
column.c Replace all die("BUG: ...") calls by BUG() ones 2018-05-06 19:06:13 +09:00
column.h
combine-diff.c object-store: move object access functions to object-store.h 2018-05-16 11:42:03 +09:00
command-list.txt Merge branch 'nd/command-list' 2018-06-01 15:06:37 +09:00
commit-graph.c Merge branch 'nd/i18n' 2018-08-15 15:08:23 -07:00
commit-graph.h commit-graph: add repo arg to graph readers 2018-07-17 15:47:48 -07:00
commit-slab-decl.h commit-slab: support shared commit-slab 2018-05-21 14:07:19 +09:00
commit-slab-impl.h commit-slabs: remove realloc counter outside of slab struct 2018-06-29 10:43:40 -07:00
commit-slab.h commit-slab: support shared commit-slab 2018-05-21 14:07:19 +09:00
commit.c Merge branch 'jt/commit-graph-per-object-store' 2018-08-02 15:30:47 -07:00
commit.h Merge branch 'sb/object-store-lookup' 2018-08-02 15:30:42 -07:00
common-main.c Merge branch 'dj/runtime-prefix' 2018-05-08 15:59:17 +09:00
config.c Merge branch 'mk/http-backend-content-length' 2018-08-17 13:09:57 -07:00
config.h Merge branch 'hn/config-in-code-comment' 2018-08-17 13:09:58 -07:00
config.mak.dev Makefile: add a DEVOPTS flag to get pedantic compilation 2018-07-25 09:52:32 -07:00
config.mak.in
config.mak.uname mingw: define WIN32 explicitly 2018-07-30 13:14:39 -07:00
configure.ac Merge branch 'es/fread-reads-dir-autoconf-fix' 2018-04-25 13:29:01 +09:00
connect.c connect.c: mark more strings for translation 2018-07-23 11:19:10 -07:00
connect.h fixup! connect.h: avoid forward declaration of an enum 2018-07-09 14:35:39 -07:00
connected.c fetch-pack: write shallow, then check connectivity 2018-07-03 14:57:44 -07:00
connected.h fetch-pack: write shallow, then check connectivity 2018-07-03 14:57:44 -07:00
convert.c Merge branch 'jk/size-t' 2018-08-15 15:08:25 -07:00
convert.h convert.h: drop 'extern' from function declaration 2018-08-03 10:42:55 -07:00
copy.c
COPYING
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
credential.c credential: ignore SIGPIPE when writing to credential helpers 2018-03-29 15:33:55 -07:00
credential.h
csum-file.c csum-file: refactor finalize_hashfile() method 2018-04-02 14:27:30 -07:00
csum-file.h csum-file: refactor finalize_hashfile() method 2018-04-02 14:27:30 -07:00
ctype.c kwset: use unsigned char to store values with high-bit set 2015-03-02 12:32:24 -08:00
daemon.c Merge branch 'lw/daemon-log-destination' 2018-04-25 13:28:58 +09:00
date.c Replace all die("BUG: ...") calls by BUG() ones 2018-05-06 19:06:13 +09: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
detect-compiler Makefile: detect compiler and enable more warnings in DEVELOPER=1 2018-04-16 13:54:53 +09:00
diff-delta.c Merge branch 'mk/diff-delta-avoid-large-offset' 2017-09-28 14:47:56 +09:00
diff-lib.c trace.h: support nested performance tracing 2018-08-18 09:47:46 -07: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/i18n' 2018-08-15 15:08:23 -07:00
diff.h diff.h: remove extern from function declaration 2018-08-03 10:42:55 -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 regex: do not call regfree() if compilation fails 2018-05-21 13:58:32 +09:00
diffcore-rename.c object-store: move object access functions to object-store.h 2018-05-16 11:42:03 +09:00
diffcore.h diffcore.h: drop extern from function declaration 2018-08-03 10:42:55 -07:00
dir-iterator.c Replace all die("BUG: ...") calls by BUG() ones 2018-05-06 19:06:13 +09:00
dir-iterator.h
dir.c trace.h: support nested performance tracing 2018-08-18 09:47:46 -07:00
dir.h Merge branch 'bc/object-id' 2018-05-30 14:04:10 +09:00
editor.c launch_editor(): indicate that Git waits for user input 2017-12-07 10:10:19 -08:00
entry.c object-store: move object access functions to object-store.h 2018-05-16 11:42:03 +09:00
environment.c Merge branch 'nd/i18n' 2018-08-15 15:08:23 -07:00
exec-cmd.c exec-cmd.c: mark more strings for translation 2018-07-23 11:19:10 -07:00
exec-cmd.h Merge branch 'dj/runtime-prefix' 2018-05-08 15:59:17 +09:00
fast-import.c Merge branch 'sb/object-store-lookup' 2018-08-02 15:30:42 -07:00
fetch-negotiator.c negotiator: unknown fetch.negotiationAlgorithm should error out 2018-08-01 11:07:47 -07:00
fetch-negotiator.h negotiator/skipping: skip commits during fetch 2018-07-16 14:51:12 -07:00
fetch-object.c fetch-pack: unify ref in and out param 2018-08-01 15:00:52 -07:00
fetch-object.h unpack-trees: batch fetching of missing blobs 2017-12-08 09:58:51 -08:00
fetch-pack.c Merge branch 'ab/fsck-transfer-updates' 2018-08-17 13:09:54 -07:00
fetch-pack.h Merge branch 'jt/fetch-nego-tip' 2018-08-02 15:30:43 -07:00
fmt-merge-msg.h
fsck.c Merge branch 'sb/object-store-lookup' 2018-08-02 15:30:42 -07:00
fsck.h fsck: detect gitmodules files 2018-05-21 23:55:12 -04:00
fsmonitor.c Merge branch 'jk/snprintf-truncation' 2018-05-30 21:51:28 +09:00
fsmonitor.h dir.c: ignore paths containing .git when invalidating untracked cache 2018-02-07 12:27:02 -08:00
generate-cmdlist.sh help: add --config to list all available config 2018-05-29 14:51:28 +09:00
gettext.c Merge branch 'js/runtime-prefix' 2018-05-08 15:59:34 +09:00
gettext.h gettext: add is_utf8_locale() 2016-07-01 12:44:57 -07:00
git-add--interactive.perl Merge branch 'pw/add-p-recount' 2018-06-28 12:53:32 -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 automatically ban strcpy() 2018-07-26 10:12:09 -07: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 Merge branch 'mb/filter-branch-optim' 2018-07-18 12:20:32 -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 merge-one-file: compute empty blob object ID 2018-05-02 13:59:53 +09: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: add the p4-pre-submit hook 2018-08-01 13:37:18 -07:00
git-parse-remote.sh
git-quiltimport.sh
git-rebase--am.sh Merge branch 'pw/rebase-signoff' 2018-04-25 13:28:51 +09:00
git-rebase--interactive.sh Merge branch 'ag/rebase-p' 2018-06-25 13:22:39 -07:00
git-rebase--merge.sh Merge branch 'en/rebase-i-microfixes' 2018-07-18 12:20:33 -07:00
git-rebase--preserve-merges.sh git-rebase--preserve-merges: fix formatting of todo help message 2018-07-06 12:09:27 -07:00
git-rebase.sh Merge branch 'en/rebase-consistency' 2018-07-24 14:50:43 -07: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 'jm/send-email-tls-auth-on-batch' 2018-08-02 15:30: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 Merge branch 'va/i18n-even-more' 2016-12-27 00:11:45 -08:00
git-stash.sh Merge branch 'tg/stash-untracked-with-pathspec-fix' 2018-04-10 08:25:45 +09:00
git-submodule.sh Merge branch 'sb/submodule-core-worktree' 2018-07-18 12:20:28 -07:00
git-svn.perl git-svn: search --authors-prog in PATH too 2018-04-05 06:55:02 +00:00
GIT-VERSION-GEN Prepare to start 2.19 cycle 2018-06-25 13:22:27 -07:00
git-web--browse.sh
git.c Merge branch 'jk/core-use-replace-refs' 2018-08-15 15:08:23 -07:00
git.rc mingw: include the full version information in the resources 2017-11-01 13:43:52 +09:00
gpg-interface.c gpg-interface: introduce new signature format "x509" using gpgsm 2018-07-18 10:02:23 -07:00
gpg-interface.h gpg-interface: make parse_gpg_output static and remove from interface header 2018-07-11 10:05:22 -07:00
graph.c graph: use strbuf_addchars() to add spaces 2017-10-02 13:14:07 +09:00
graph.h
grep.c Merge branch 'tb/grep-only-matching' 2018-08-02 15:30:44 -07:00
grep.h Merge branch 'tb/grep-only-matching' 2018-08-02 15:30:44 -07: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 Merge branch 'mk/http-backend-content-length' 2018-08-17 13:09:57 -07:00
help.h completion: drop the hard coded list of config vars 2018-05-29 14:51:28 +09:00
hex.c hex: switch to using the_hash_algo 2018-07-16 14:27:39 -07:00
http-backend.c Merge branch 'mk/http-backend-content-length' 2018-08-17 13:09:57 -07:00
http-fetch.c Merge branch 'ma/http-walker-no-partial' 2018-05-08 15:59:35 +09:00
http-push.c tag: add repository argument to deref_tag 2018-06-29 10:43:39 -07:00
http-walker.c Merge branch 'sb/object-store' 2018-04-11 13:09:55 +09:00
http.c Merge branch 'bw/remote-curl-compressed-responses' 2018-05-30 21:51:29 +09:00
http.h Merge branch 'jk/snprintf-truncation' 2018-05-30 21:51:28 +09:00
ident.c Merge branch 'bw/config-h' 2017-06-24 14:28:41 -07:00
imap-send.c Replace all die("BUG: ...") calls by BUG() ones 2018-05-06 19:06:13 +09:00
INSTALL RelNotes: add details on Perl module changes 2018-03-16 16:07:37 -07:00
iterator.h
json-writer.c json_writer: new routines to create JSON data 2018-07-16 13:55:39 -07:00
json-writer.h json_writer: new routines to create JSON data 2018-07-16 13:55:39 -07:00
khash.h convert trivial cases to ALLOC_ARRAY 2016-02-22 14:51:09 -08:00
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
LGPL-2.1
line-log.c Merge branch 'sb/object-store-lookup' 2018-08-02 15:30:42 -07:00
line-log.h ALLOC_GROW: avoid -Wsign-compare warnings 2017-09-22 13:21:11 +09:00
line-range.c blame: prevent error if range ends past end of file 2018-06-15 10:29:13 -07:00
line-range.h line-range.h: drop extern from function declaration 2018-08-03 10:42:55 -07:00
list-objects-filter-options.c list-objects: check if filter is NULL before using 2018-06-12 10:46:56 -07: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 Merge branch 'sb/object-store-grafts' 2018-07-18 12:20:28 -07: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 'sb/object-store-lookup' 2018-08-02 15:30:42 -07: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 Replace all die("BUG: ...") calls by BUG() ones 2018-05-06 19:06:13 +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 'jk/core-use-replace-refs' 2018-08-15 15:08:23 -07:00
log-tree.h format-patch: make cover letters always text/plain 2018-05-02 12:55:00 +09:00
ls-refs.c ls-refs: introduce ls-refs server command 2018-03-15 12:01:08 -07:00
ls-refs.h ls-refs: introduce ls-refs server command 2018-03-15 12:01:08 -07:00
mailinfo.c Replace all die("BUG: ...") calls by BUG() ones 2018-05-06 19:06:13 +09:00
mailinfo.h
mailmap.c object-store: move object access functions to object-store.h 2018-05-16 11:42:03 +09:00
mailmap.h
Makefile Merge branch 'nd/complete-config-vars' 2018-08-17 13:09:59 -07:00
match-trees.c Merge branch 'jk/merge-subtree-heuristics' 2018-08-17 13:09:55 -07:00
mem-pool.c block alloc: add validations around cache_entry lifecyle 2018-07-03 10:58:27 -07:00
mem-pool.h block alloc: add validations around cache_entry lifecyle 2018-07-03 10:58:27 -07:00
merge-blobs.c object-store: move object access functions to object-store.h 2018-05-16 11:42:03 +09:00
merge-blobs.h Which merge_file() function do you mean? 2012-12-09 23:05:27 -08:00
merge-recursive.c Merge branch 'en/merge-recursive-skip-fix' 2018-08-15 15:08:26 -07:00
merge-recursive.h merge: add merge.renames config setting 2018-05-08 16:19:41 +09:00
merge.c Merge branch 'en/dirty-merge-fixes' 2018-08-02 15:30:45 -07:00
mergesort.c
mergesort.h
name-hash.c trace.h: support nested performance tracing 2018-08-18 09:47:46 -07:00
notes-cache.c commit: add repository argument to lookup_commit_reference_gently 2018-06-29 10:43:39 -07:00
notes-cache.h
notes-merge.c Merge branch 'sb/object-store-grafts' 2018-07-18 12:20:28 -07:00
notes-merge.h notes-merge: convert notes_merge* to struct object_id 2017-06-05 11:23:58 +09:00
notes-utils.c commit: add repository argument to lookup_commit 2018-06-29 10:43:39 -07:00
notes-utils.h commit: convert commit_tree* to object_id 2018-01-30 10:42:36 -08:00
notes.c object-store: move object access functions to object-store.h 2018-05-16 11:42:03 +09:00
notes.h notes: convert write_notes_tree to object_id 2018-01-30 10:42:36 -08:00
object-store.h Merge branch 'sb/object-store-grafts' 2018-07-18 12:20:28 -07:00
object.c Merge branch 'nd/i18n' 2018-08-15 15:08:23 -07:00
object.h Merge branch 'sb/object-store-lookup' 2018-08-02 15:30:42 -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 Merge branch 'jt/remove-pack-bitmap-global' 2018-07-18 12:20:30 -07:00
pack-bitmap.c pack-bitmap: add free function 2018-06-21 12:22:48 -07:00
pack-bitmap.h pack-bitmap: add free function 2018-06-21 12:22:48 -07:00
pack-check.c packfile: add repository argument to unpack_entry 2018-04-26 10:54:27 +09:00
pack-objects.c Merge branch 'js/use-bug-macro' 2018-05-30 14:04:07 +09:00
pack-objects.h Merge branch 'nd/pack-objects-pack-struct' 2018-05-23 14:38:19 +09:00
pack-revindex.c object-store: move packed_git and packed_git_mru to object store 2018-03-26 10:05:46 -07:00
pack-revindex.h
pack-write.c csum-file: refactor finalize_hashfile() method 2018-04-02 14:27:30 -07:00
pack.h csum-file: rename sha1file to hashfile 2018-02-02 11:28:41 -08:00
packfile.c object: add repository argument to parse_object 2018-06-29 10:43:38 -07:00
packfile.h packfile: ensure that enum object_type is defined 2018-07-26 10:36:26 -07:00
pager.c Merge branch 'nd/command-list' 2018-06-01 15:06:37 +09:00
parse-options-cb.c commit: add repository argument to lookup_commit_reference 2018-06-29 10:43:39 -07:00
parse-options.c Merge branch 'rs/parse-opt-lithelp' 2018-08-17 13:09:56 -07:00
parse-options.h Merge branch 'ps/contains-id-error-message' 2018-04-10 16:28:20 +09: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
path.c Merge branch 'sb/object-store-grafts' 2018-07-18 12:20:28 -07:00
path.h Merge branch 'bb/pedantic' 2018-07-24 14:50:47 -07:00
pathspec.c Convert remaining die*(BUG) messages 2018-05-06 19:06:14 +09:00
pathspec.h Merge branch 'bw/pathspec-match-submodule-boundary' 2017-12-19 11:33:56 -08:00
pkt-line.c pkt-line.c: mark more strings for translation 2018-07-23 11:19:10 -07:00
pkt-line.h pkt-line: add packet_buf_write_len function 2018-03-15 12:01:09 -07:00
preload-index.c trace.h: support nested performance tracing 2018-08-18 09:47:46 -07:00
pretty.c Merge branch 'jk/size-t' 2018-08-15 15:08:25 -07:00
pretty.h format: create docs for pretty.h 2017-12-12 10:41:15 -08:00
prio-queue.c Replace all die("BUG: ...") calls by BUG() ones 2018-05-06 19:06:13 +09: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 enum protocol_version value protocol_v2 2018-03-14 14:15:07 -07:00
protocol.h protocol: introduce enum protocol_version value protocol_v2 2018-03-14 14:15:07 -07: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 tree: add repository argument to lookup_tree 2018-06-29 10:43:38 -07:00
reachable.h
read-cache.c unpack-trees: reuse (still valid) cache-tree from src_index 2018-08-18 09:47:46 -07:00
README.md note git-security@googlegroups.com in more places 2018-06-01 09:24:11 +09:00
ref-filter.c Merge branch 'ot/ref-filter-object-info' 2018-08-17 13:09:57 -07:00
ref-filter.h Merge branch 'ot/libify-get-ref-atom-value' 2018-05-08 15:59:18 +09:00
reflog-walk.c Merge branch 'nd/i18n' 2018-08-15 15:08:23 -07:00
reflog-walk.h reflog-walk: apply --since/--until to reflog dates 2017-07-09 10:00:48 -07:00
refs.c Merge branch 'jt/refspec-dwim-precedence-fix' 2018-08-17 13:09:55 -07:00
refs.h Merge branch 'sb/object-store-replace' 2018-05-08 15:59:21 +09:00
refspec.c refspec.c: mark more strings for translation 2018-07-23 11:19:10 -07:00
refspec.h refspec: add back a refspec_item_init() function 2018-06-11 10:11:31 -07:00
RelNotes Prepare to start 2.19 cycle 2018-06-25 13:22:27 -07:00
remote-curl.c remote-curl: accept compressed responses with protocol v2 2018-05-23 10:24:13 +09:00
remote-testsvn.c Merge branch 'sb/object-store-grafts' 2018-07-18 12:20:28 -07:00
remote.c Merge branch 'jt/refspec-dwim-precedence-fix' 2018-08-17 13:09:55 -07:00
remote.h fetch-pack: implement ref-in-want 2018-06-28 09:33:30 -07:00
replace-object.c Merge branch 'nd/i18n' 2018-08-15 15:08:23 -07:00
replace-object.h check_replace_refs: rename to read_replace_refs 2018-07-18 15:45:14 -07:00
repository.c Merge branch 'sb/object-store-alloc' 2018-06-25 13:22:38 -07:00
repository.h repository.h: drop extern from function declaration 2018-08-03 10:42:55 -07:00
rerere.c Merge branch 'sb/object-store-grafts' 2018-07-18 12:20:28 -07:00
rerere.h rerere.h: drop extern from function declaration 2018-08-03 10:42:55 -07:00
resolve-undo.c block alloc: add lifecycle APIs for cache_entry structs 2018-07-03 10:58:27 -07:00
resolve-undo.h resolve-undo: convert struct resolve_undo_info to object_id 2018-03-14 09:23:47 -07:00
revision.c Merge branch 'jt/tags-to-promised-blobs-fix' 2018-08-02 15:30:46 -07:00
revision.h revision.h: drop extern from function declaration 2018-08-03 10:43:06 -07:00
run-command.c Replace all die("BUG: ...") calls by BUG() ones 2018-05-06 19:06:13 +09:00
run-command.h
send-pack.c shallow: add repository argument to is_repository_shallow 2018-05-18 08:13:10 +09:00
send-pack.h
sequencer.c Merge branch 'es/rebase-i-author-script-fix' 2018-08-17 13:09:54 -07:00
sequencer.h Merge branch 'js/sequencer-and-root-commits' 2018-05-30 14:04:04 +09:00
serve.c serve: introduce the server-option capability 2018-04-24 11:24:40 +09:00
serve.h serve: introduce git-serve 2018-03-15 12:01:08 -07:00
server-info.c tag: add repository argument to deref_tag 2018-06-29 10:43:39 -07:00
setup.c Replace all die("BUG: ...") calls by BUG() ones 2018-05-06 19:06:13 +09:00
sh-i18n--envsubst.c Replace Free Software Foundation address in license notices 2017-11-09 13:21:21 +09:00
sha1-array.c get_short_oid: sort ambiguous objects by type, then SHA-1 2018-05-11 14:43:23 +09:00
sha1-array.h get_short_oid: sort ambiguous objects by type, then SHA-1 2018-05-11 14:43:23 +09:00
sha1-file.c Merge branch 'nd/i18n' 2018-08-15 15:08:23 -07:00
sha1-lookup.c Replace all die("BUG: ...") calls by BUG() ones 2018-05-06 19:06:13 +09:00
sha1-lookup.h packfile: refactor hash search with fanout table 2018-02-15 13:08:55 -08:00
sha1-name.c Merge branch 'sb/object-store-lookup' 2018-08-02 15:30:42 -07: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 'sb/object-store-grafts' 2018-07-18 12:20:28 -07:00
shell.c Merge branch 'nd/command-list' 2018-06-01 15:06:37 +09:00
shortlog.h
sideband.c Avoid multiple PREFIX definitions 2018-04-24 11:12:32 +09:00
sideband.h sideband.c: make send_sideband() return void 2016-06-16 11:40:19 -07:00
sigchain.c Replace all die("BUG: ...") calls by BUG() ones 2018-05-06 19:06:13 +09:00
sigchain.h
split-index.c block alloc: allocate cache entries from mem_pool 2018-07-03 10:58:27 -07:00
split-index.h split-index: convert struct split_index to object_id 2018-05-02 13:59:50 +09:00
strbuf.c Merge branch 'jk/size-t' 2018-08-15 15:08:25 -07:00
strbuf.h Merge branch 'en/rename-directory-detection-reboot' 2018-05-23 14:38:19 +09:00
streaming.c cache.h: add repository argument to oid_object_info_extended 2018-04-26 10:54:27 +09:00
streaming.h streaming: convert open_istream to use struct object_id 2018-03-14 09:23:49 -07:00
string-list.c string-list.c: avoid conversion from void * to function pointer 2018-07-09 14:37:50 -07: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 Merge branch 'jk/fsck-gitmodules-gently' 2018-08-02 15:30:39 -07:00
submodule-config.h submodule-config: make 'config_from_gitmodules' private 2018-06-26 12:56:12 -07:00
submodule.c Merge branch 'sb/object-store-lookup' 2018-08-02 15:30:42 -07:00
submodule.h submodule.h: drop extern from function declaration 2018-08-03 10:50:32 -07:00
symlinks.c
tag.c Merge branch 'jt/tags-to-promised-blobs-fix' 2018-08-02 15:30:46 -07:00
tag.h tag.c: allow deref_tag to handle arbitrary repositories 2018-06-29 10:43:40 -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 pack-objects: set number of threads before checking and warning 2014-10-13 12:53:46 -07:00
tmp-objdir.c Replace all die("BUG: ...") calls by BUG() ones 2018-05-06 19:06:13 +09:00
tmp-objdir.h
trace.c trace.h: support nested performance tracing 2018-08-18 09:47:46 -07:00
trace.h trace.h: support nested performance tracing 2018-08-18 09:47:46 -07:00
trailer.c Replace all die("BUG: ...") calls by BUG() ones 2018-05-06 19:06:13 +09:00
trailer.h Merge branch 'jk/trailers-parse' 2017-08-26 22:55:04 -07:00
transport-helper.c Merge branch 'jt/connectivity-check-after-unshallow' 2018-08-15 15:08:28 -07:00
transport-internal.h fetch-pack: unify ref in and out param 2018-08-01 15:00:52 -07:00
transport.c Merge branch 'jt/connectivity-check-after-unshallow' 2018-08-15 15:08:28 -07:00
transport.h Merge branch 'jt/connectivity-check-after-unshallow' 2018-08-15 15:08:28 -07:00
tree-diff.c diff: make struct diff_flags members lowercase 2017-11-01 11:51:40 +09:00
tree-walk.c Merge branch 'bc/object-id' 2018-08-02 15:30:39 -07:00
tree-walk.h tree-walk: convert get_tree_entry_follow_symlinks to object_id 2018-05-02 13:59:50 +09:00
tree.c Merge branch 'jm/cache-entry-from-mem-pool' 2018-08-02 15:30:43 -07:00
tree.h tree: allow lookup_tree to handle arbitrary repositories 2018-06-29 10:43:39 -07:00
unicode-width.h unicode: update the width tables to Unicode 11 2018-07-09 14:02:51 -07:00
unimplemented.sh
unix-socket.c
unix-socket.h
unpack-trees.c unpack-trees: reuse (still valid) cache-tree from src_index 2018-08-18 09:47:46 -07:00
unpack-trees.h unpack_trees_options: free messages when done 2018-05-22 11:59:31 +09:00
upload-pack.c Merge branch 'sb/object-store-lookup' 2018-08-02 15:30:42 -07:00
upload-pack.h fetch-pack: perform a fetch using v2 2018-03-15 12:01:08 -07:00
url.c
url.h url: decode buffers that are not NUL-terminated 2011-07-20 11:38:34 -07:00
urlmatch.c urlmatch: use hex2chr() in append_normalized_escapes() 2017-07-09 09:43:01 -07:00
urlmatch.h
usage.c Merge branch 'jk/snprintf-truncation' 2018-05-30 21:51:28 +09:00
userdiff.c userdiff: support new keywords in PHP hunk header 2018-07-06 14:59:28 -07:00
userdiff.h
utf8.c Merge branch 'jk/size-t' 2018-08-15 15:08:25 -07:00
utf8.h reencode_string: use size_t for string lengths 2018-07-24 10:19:29 -07: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 Merge branch 'sb/object-store-grafts' 2018-07-18 12:20:28 -07:00
walker.h walker: drop fields of struct walker which are always 1 2018-04-24 10:55:04 +09:00
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 Replace all die("BUG: ...") calls by BUG() ones 2018-05-06 19:06:13 +09: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 Make running git under other debugger-like programs easy 2018-04-25 10:47:22 +09:00
wrapper.c Replace all die("BUG: ...") calls by BUG() ones 2018-05-06 19:06:13 +09:00
write-or-die.c write_or_die.c: rename to use dashes in file name 2018-04-11 18:11:00 +09:00
ws.c
wt-status.c Merge branch 'sb/object-store-lookup' 2018-08-02 15:30:42 -07:00
wt-status.h add status config and command line options for rename detection 2018-05-13 10:57:37 +09:00
xdiff-interface.c object-store: move object access functions to object-store.h 2018-05-16 11:42:03 +09:00
xdiff-interface.h xdiff-interface: export comparing and hashing strings 2017-10-26 11:23:22 +09:00
zlib.c Replace all die("BUG: ...") calls by BUG() ones 2018-05-06 19:06:13 +09:00

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.

Issues which are security relevant should be disclosed privately to the Git Security mailing list git-security@googlegroups.com.

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