1
0
mirror of https://github.com/git/git.git synced 2024-10-21 08:08:16 +02:00
Git Source Code Mirror. Please follow Documentation/SubmittingPatches procedure for any of your improvements.
Go to file
Jonathan Tan f08cbf60fe index-pack: make quantum of work smaller
Currently, when index-pack resolves deltas, it does not split up delta
trees into threads: each delta base root (an object that is not a
REF_DELTA or OFS_DELTA) can go into its own thread, but all deltas on
that root (direct or indirect) are processed in the same thread.

This is a problem when a repository contains a large text file (thus,
delta-able) that is modified many times - delta resolution time during
fetching is dominated by processing the deltas corresponding to that
text file.

This patch contains a solution to that. When cloning using

  git -c core.deltabasecachelimit=1g clone \
    https://fuchsia.googlesource.com/third_party/vulkan-cts

on my laptop, clone time improved from 3m2s to 2m5s (using 3 threads,
which is the default).

The solution is to have a global work stack. This stack contains delta
bases (objects, whether appearing directly in the packfile or generated
by delta resolution, that themselves have delta children) that need to
be processed; whenever a thread needs work, it peeks at the top of the
stack and processes its next unprocessed child. If a thread finds the
stack empty, it will look for more delta base roots to push on the stack
instead.

The main weakness of having a global work stack is that more time is
spent in the mutex, but profiling has shown that most time is spent in
the resolution of the deltas themselves, so this shouldn't be an issue
in practice. In any case, experimentation (as described in the clone
command above) shows that this patch is a net improvement.

Signed-off-by: Jonathan Tan <jonathantanmy@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2020-09-08 15:52:17 -07:00
.github Merge branch 'ss/cmake-build' 2020-08-11 18:04:13 -07:00
block-sha1
builtin index-pack: make quantum of work smaller 2020-09-08 15:52:17 -07:00
ci Merge branch 'bc/sha-256-part-3' 2020-08-11 18:04:11 -07:00
compat Merge branch 'jh/mingw-unlink' 2020-08-19 16:14:53 -07:00
contrib Merge branch 'pd/mergetool-nvimdiff' 2020-08-17 17:02:43 -07:00
Documentation Documentation: deltaBaseCacheLimit is per-thread 2020-08-24 13:55:06 -07:00
ewah
git-gui Merge https://github.com/prati0100/git-gui into master 2020-07-20 12:04:06 -07:00
gitk-git
gitweb
mergetools mergetools: add support for nvimdiff (neovim) family 2020-07-29 14:44:49 -07:00
negotiator
perl git-send-email: die if sendmail.* config is set 2020-07-23 18:00:34 -07:00
po Merge branch 'master' of github.com:Softcatala/git-po 2020-07-27 00:05:41 +08:00
ppc
refs refs: move the logic to add \t to reflog to the files backend 2020-07-31 10:21:51 -07:00
sha1collisiondetection@855827c583
sha1dc
sha256
t Merge branch 'ds/sha256-leftover-bits' 2020-08-19 16:14:53 -07:00
templates
trace2
vcs-svn
xdiff
.cirrus.yml
.clang-format
.editorconfig
.gitattributes
.gitignore
.gitmodules
.mailmap
.travis.yml
.tsan-suppressions
abspath.c
aclocal.m4
add-interactive.c strvec: rename struct fields 2020-07-30 19:18:06 -07:00
add-interactive.h
add-patch.c Merge branch 'jk/strvec' 2020-08-10 10:23:57 -07:00
advice.c
advice.h
alias.c
alias.h
alloc.c
alloc.h
apply.c Merge branch 'rp/apply-cached-with-i-t-a' 2020-08-17 17:02:46 -07:00
apply.h
archive-tar.c
archive-zip.c
archive.c
archive.h
attr.c
attr.h
banned.h
base85.c
bisect.c Merge branch 'al/bisect-first-parent' 2020-08-17 17:02:45 -07:00
bisect.h bisect: combine args passed to find_bisection() 2020-08-07 15:13:03 -07:00
blame.c blame: only coalesce lines that are adjacent in result 2020-08-13 10:09:38 -07:00
blame.h
blob.c
blob.h
bloom.c Merge branch 'ds/commit-graph-bloom-updates' into master 2020-07-30 13:20:31 -07:00
bloom.h
branch.c Merge branch 'es/get-worktrees-unsort' 2020-07-06 22:09:15 -07:00
branch.h
bugreport.c Merge branch 'rs/retire-strbuf-write-fd' 2020-06-29 14:17:26 -07:00
builtin.h
bulk-checkin.c
bulk-checkin.h
bundle.c Merge branch 'bc/sha-256-part-3' 2020-08-11 18:04:11 -07:00
bundle.h Merge branch 'bc/sha-256-part-3' 2020-08-11 18:04:11 -07:00
cache-tree.c
cache-tree.h
cache.h Merge branch 'jk/reject-newer-extensions-in-v0' into master 2020-07-30 13:20:32 -07:00
chdir-notify.c
chdir-notify.h
check_bindir
check-builtins.sh
checkout.c
checkout.h
CODE_OF_CONDUCT.md
color.c
color.h
column.c Merge branch 'jk/strvec' 2020-08-10 10:23:57 -07:00
column.h
combine-diff.c
command-list.txt command-list.txt: add missing 'gitcredentials' and 'gitremote-helpers' 2020-08-04 18:34:01 -07:00
commit-graph.c commit-graph: use the "hash version" byte 2020-08-17 16:45:14 -07:00
commit-graph.h Merge branch 'ds/commit-graph-bloom-updates' into master 2020-07-30 13:20:31 -07:00
commit-reach.c Merge branch 'cb/is-descendant-of' 2020-07-06 22:09:16 -07:00
commit-reach.h commit-reach: avoid is_descendant_of() shim 2020-06-23 16:36:53 -07:00
commit-slab-decl.h Merge branch 'sg/commit-graph-cleanups' into master 2020-07-30 13:20:30 -07:00
commit-slab-impl.h
commit-slab.h
commit.c strvec: rename struct fields 2020-07-30 19:18:06 -07:00
commit.h
common-main.c
config.c config: work around gcc-10 -Wstringop-overflow warning 2020-08-04 09:31:01 -07:00
config.h
config.mak.dev repository: enable SHA-256 support by default 2020-07-30 09:16:49 -07:00
config.mak.in
config.mak.uname
configure.ac
connect.c strvec: rename struct fields 2020-07-30 19:18:06 -07:00
connect.h Merge branch 'bc/sha-256-part-2' 2020-07-06 22:09:13 -07:00
connected.c strvec: fix indentation in renamed calls 2020-07-28 15:02:18 -07:00
connected.h
convert.c
convert.h
copy.c
COPYING
credential-cache--daemon.c
credential-cache.c
credential-store.c
credential.c
credential.h
csum-file.c
csum-file.h
ctype.c
daemon.c strvec: rename struct fields 2020-07-30 19:18:06 -07:00
date.c
decorate.c
decorate.h
delta-islands.c
delta-islands.h
delta.h
detect-compiler
diff-delta.c
diff-lib.c diff-lib: use worktree mode in diffs from i-t-a entries 2020-08-09 11:14:29 -07:00
diff-no-index.c
diff.c strvec: rename struct fields 2020-07-30 19:18:06 -07:00
diff.h
diffcore-break.c
diffcore-delta.c
diffcore-order.c
diffcore-pickaxe.c
diffcore-rename.c
diffcore.h
dir-iterator.c
dir-iterator.h
dir.c Merge branch 'en/fill-directory-exponential' into master 2020-07-30 13:20:36 -07:00
dir.h
editor.c
entry.c Merge branch 'mt/entry-fstat-fallback-fix' into master 2020-07-09 14:00:45 -07:00
environment.c strvec: rename struct fields 2020-07-30 19:18:06 -07:00
exec-cmd.c strvec: rename struct fields 2020-07-30 19:18:06 -07:00
exec-cmd.h argv-array: rename to strvec 2020-07-28 15:02:17 -07:00
fast-import.c strvec: convert more callers away from argv_array name 2020-07-28 15:02:18 -07:00
fetch-negotiator.c
fetch-negotiator.h
fetch-pack.c strvec: fix indentation in renamed calls 2020-07-28 15:02:18 -07:00
fetch-pack.h
fmt-merge-msg.c fmt-merge-msg: allow merge destination to be omitted again 2020-07-30 12:43:10 -07:00
fmt-merge-msg.h
fsck.c
fsck.h
fsmonitor.c Merge branch 'jk/strvec' 2020-08-10 10:23:57 -07:00
fsmonitor.h
fuzz-commit-graph.c
fuzz-pack-headers.c
fuzz-pack-idx.c
generate-cmdlist.sh
generate-configlist.sh
gettext.c
gettext.h
git-add--interactive.perl
git-archimport.perl
git-bisect.sh Merge branch 'al/bisect-first-parent' 2020-08-17 17:02:45 -07:00
git-compat-util.h compat-util: type-check parameters of no-op replacement functions 2020-08-06 17:25:37 -07:00
git-cvsexportcommit.perl git-cvsexportcommit: support Perl before 5.10.1 2020-08-05 17:32:39 -07:00
git-cvsimport.perl git-cvsimport: port to SHA-256 2020-06-22 11:21:07 -07:00
git-cvsserver.perl git-cvsserver: port to SHA-256 2020-06-22 11:21:07 -07:00
git-difftool--helper.sh
git-filter-branch.sh
git-instaweb.sh
git-merge-octopus.sh
git-merge-one-file.sh
git-merge-resolve.sh
git-mergetool--lib.sh mergetools: add support for nvimdiff (neovim) family 2020-07-29 14:44:49 -07:00
git-mergetool.sh
git-p4.py
git-parse-remote.sh
git-quiltimport.sh
git-rebase--preserve-merges.sh rebase: remove unused function reschedule_last_action 2020-08-12 12:25:42 -07:00
git-request-pull.sh
git-send-email.perl git-send-email: die if sendmail.* config is set 2020-07-23 18:00:34 -07:00
git-sh-i18n.sh
git-sh-setup.sh
git-submodule.sh
git-svn.perl git-svn: set the OID length based on hash algorithm 2020-06-22 11:21:07 -07:00
GIT-VERSION-GEN Git 2.28 2020-07-26 18:01:43 -07:00
git-web--browse.sh
git.c strvec: rename struct fields 2020-07-30 19:18:06 -07:00
git.rc
gpg-interface.c strvec: fix indentation in renamed calls 2020-07-28 15:02:18 -07:00
gpg-interface.h
graph.c strvec: rename struct fields 2020-07-30 19:18:06 -07:00
graph.h
grep.c comment: fix spelling mistakes inside comments 2020-07-29 11:39:40 -07:00
grep.h
hash.h
hashmap.c
hashmap.h hashmap: fix typo in usage docs 2020-07-28 14:28:15 -07:00
help.c help: drop usage of 'common' and 'useful' for guides 2020-08-04 18:34:01 -07:00
help.h help: drop usage of 'common' and 'useful' for guides 2020-08-04 18:34:01 -07:00
hex.c
http-backend.c strvec: fix indentation in renamed calls 2020-07-28 15:02:18 -07:00
http-fetch.c http-fetch: set up git directory before parsing pack hashes 2020-07-30 09:16:48 -07:00
http-push.c strvec: rename struct fields 2020-07-30 19:18:06 -07:00
http-walker.c
http.c strvec: fix indentation in renamed calls 2020-07-28 15:02:18 -07:00
http.h Merge branch 'jt/cdn-offload' 2020-06-25 12:27:47 -07:00
ident.c
imap-send.c strvec: convert more callers away from argv_array name 2020-07-28 15:02:18 -07:00
INSTALL
interdiff.c
interdiff.h
iterator.h
json-writer.c
json-writer.h
khash.h
kwset.c
kwset.h
levenshtein.c
levenshtein.h
LGPL-2.1
line-log.c strvec: convert more callers away from argv_array name 2020-07-28 15:02:18 -07:00
line-log.h
line-range.c
line-range.h
linear-assignment.c
linear-assignment.h
list-objects-filter-options.c Merge branch 'tb/upload-pack-filters' 2020-08-11 18:04:13 -07:00
list-objects-filter-options.h list_objects_filter_options: introduce 'list_object_filter_config_name' 2020-08-03 18:03:24 -07:00
list-objects-filter.c
list-objects-filter.h
list-objects.c
list-objects.h
list.h
ll-merge.c
ll-merge.h
lockfile.c
lockfile.h
log-tree.c
log-tree.h
ls-refs.c strvec: rename struct fields 2020-07-30 19:18:06 -07:00
ls-refs.h argv-array: rename to strvec 2020-07-28 15:02:17 -07:00
mailinfo.c
mailinfo.h
mailmap.c
mailmap.h
Makefile strvec: rename files from argv-array to strvec 2020-07-28 15:02:17 -07:00
match-trees.c
mem-pool.c
mem-pool.h
merge-blobs.c
merge-blobs.h *.[ch]: manually align parameter lists 2019-05-05 15:20:10 +09:00
merge-recursive.c Merge branch 'en/eol-attrs-gotchas' 2020-08-10 10:24:02 -07:00
merge-recursive.h merge-recursive: fix unclear and outright wrong comments 2020-08-02 11:03:57 -07:00
merge.c strvec: rename struct fields 2020-07-30 19:18:06 -07:00
mergesort.c
mergesort.h
midx.c multi-pack-index: use hash version byte 2020-08-17 16:45:20 -07:00
midx.h
name-hash.c
notes-cache.c
notes-cache.h
notes-merge.c
notes-merge.h
notes-utils.c
notes-utils.h
notes.c
notes.h
object-store.h sha1-file: introduce no-lazy-fetch has_object() 2020-08-06 13:01:02 -07:00
object.c
object.h Merge branch 'tb/fix-persistent-shallow' into master 2020-07-09 14:00:44 -07:00
oid-array.c
oid-array.h
oidmap.c
oidmap.h
oidset.c
oidset.h
pack-bitmap-write.c
pack-bitmap.c
pack-bitmap.h
pack-check.c
pack-objects.c
pack-objects.h
pack-revindex.c
pack-revindex.h
pack-write.c Merge branch 'jb/doc-packfile-name' into master 2020-07-30 21:34:32 -07:00
pack.h
packfile.c
packfile.h
pager.c strvec: convert remaining callers away from argv_array name 2020-07-28 15:02:18 -07:00
parse-options-cb.c strvec: convert remaining callers away from argv_array name 2020-07-28 15:02:18 -07:00
parse-options.c
parse-options.h messages: avoid SHA-1 in end-user facing messages 2020-08-14 09:33:37 -07:00
patch-delta.c
patch-ids.c
patch-ids.h
path.c
path.h
pathspec.c strvec: rename struct fields 2020-07-30 19:18:06 -07:00
pathspec.h
pkt-line.c Merge branch 'bc/sha-256-part-2' 2020-07-06 22:09:13 -07:00
pkt-line.h Merge branch 'bc/sha-256-part-2' 2020-07-06 22:09:13 -07:00
preload-index.c
pretty.c
pretty.h
prio-queue.c
prio-queue.h
progress.c Merge branch 'ma/stop-progress-null-fix' 2020-08-17 17:02:48 -07:00
progress.h
promisor-remote.c
promisor-remote.h
prompt.c
prompt.h
protocol.c
protocol.h
prune-packed.c
prune-packed.h
quote.c strvec: convert remaining callers away from argv_array name 2020-07-28 15:02:18 -07:00
quote.h quote: rename sq_dequote_to_argv_array to mention strvec 2020-07-28 15:02:18 -07:00
range-diff.c strvec: rename struct fields 2020-07-30 19:18:06 -07:00
range-diff.h strvec: convert remaining callers away from argv_array name 2020-07-28 15:02:18 -07:00
reachable.c
reachable.h
read-cache.c read-cache: remove bogus shortcut 2020-07-16 10:42:52 -07:00
README.md
rebase-interactive.c
rebase-interactive.h
rebase.c
rebase.h
ref-filter.c Merge branch 'jk/strvec' 2020-08-10 10:23:57 -07:00
ref-filter.h
reflog-walk.c
reflog-walk.h
refs.c Merge branch 'hn/reftable-prep-part-2' 2020-08-17 17:02:42 -07:00
refs.h argv-array: rename to strvec 2020-07-28 15:02:17 -07:00
refspec.c strvec: fix indentation in renamed calls 2020-07-28 15:02:18 -07:00
refspec.h argv-array: rename to strvec 2020-07-28 15:02:17 -07:00
RelNotes First batch post 2.28 2020-07-30 13:20:36 -07:00
remote-curl.c Merge branch 'jk/strvec' 2020-08-10 10:23:57 -07:00
remote-testsvn.c strvec: convert remaining callers away from argv_array name 2020-07-28 15:02:18 -07:00
remote.c strvec: rename struct fields 2020-07-30 19:18:06 -07:00
remote.h argv-array: rename to strvec 2020-07-28 15:02:17 -07:00
replace-object.c
replace-object.h
repo-settings.c experimental: default to fetch.writeCommitGraph=false 2020-07-08 16:37:43 -07:00
repository.c repository: enable SHA-256 support by default 2020-07-30 09:16:49 -07:00
repository.h
rerere.c
rerere.h
reset.c
reset.h
resolve-undo.c
resolve-undo.h
revision.c Merge branch 'so/log-diff-merges-opt' 2020-08-17 17:02:50 -07:00
revision.h Merge branch 'jk/log-fp-implies-m' 2020-08-17 17:02:49 -07:00
run-command.c strvec: rename struct fields 2020-07-30 19:18:06 -07:00
run-command.h strvec: convert remaining callers away from argv_array name 2020-07-28 15:02:18 -07:00
send-pack.c strvec: convert remaining callers away from argv_array name 2020-07-28 15:02:18 -07:00
send-pack.h
sequencer.c Merge branch 'ak/sequencer-fix-find-uniq-abbrev' 2020-08-19 16:14:48 -07:00
sequencer.h
serve.c strvec: rename struct fields 2020-07-30 19:18:06 -07:00
serve.h argv-array: rename to strvec 2020-07-28 15:02:17 -07:00
server-info.c
setup.c Merge branch 'bc/sha-256-part-3' 2020-08-11 18:04:11 -07:00
sh-i18n--envsubst.c
sha1-file.c Merge branch 'jt/has_object' 2020-08-13 14:13:39 -07:00
sha1-lookup.c
sha1-lookup.h
sha1-name.c
sha1dc_git.c
sha1dc_git.h
shallow.c Merge branch 'sg/commit-graph-cleanups' into master 2020-07-30 13:20:30 -07:00
shallow.h
shell.c
shortlog.h
sideband.c sideband: mark "remote error:" prefix for translation 2020-08-07 12:01:57 -07:00
sideband.h
sigchain.c
sigchain.h
split-index.c
split-index.h
stable-qsort.c
strbuf.c Merge branch 'rs/retire-strbuf-write-fd' 2020-06-29 14:17:26 -07:00
strbuf.h Merge branch 'rs/retire-strbuf-write-fd' 2020-06-29 14:17:26 -07:00
streaming.c
streaming.h
string-list.c
string-list.h
strvec.c strvec: rename struct fields 2020-07-30 19:18:06 -07:00
strvec.h strvec: rename struct fields 2020-07-30 19:18:06 -07:00
sub-process.c strvec: convert remaining callers away from argv_array name 2020-07-28 15:02:18 -07:00
sub-process.h
submodule-config.c
submodule-config.h
submodule.c strvec: rename struct fields 2020-07-30 19:18:06 -07:00
submodule.h argv-array: rename to strvec 2020-07-28 15:02:17 -07:00
symlinks.c
tag.c
tag.h
tar.h
tempfile.c
tempfile.h
thread-utils.c
thread-utils.h
tmp-objdir.c strvec: rename struct fields 2020-07-30 19:18:06 -07:00
tmp-objdir.h
trace2.c
trace2.h
trace.c
trace.h
trailer.c
trailer.h
transport-helper.c strvec: rename struct fields 2020-07-30 19:18:06 -07:00
transport-internal.h strvec: convert remaining callers away from argv_array name 2020-07-28 15:02:18 -07:00
transport.c strvec: convert remaining callers away from argv_array name 2020-07-28 15:02:18 -07:00
transport.h strvec: convert remaining callers away from argv_array name 2020-07-28 15:02:18 -07:00
tree-diff.c
tree-walk.c
tree-walk.h
tree.c
tree.h
unicode-width.h
unimplemented.sh
unix-socket.c
unix-socket.h
unpack-trees.c strvec: convert remaining callers away from argv_array name 2020-07-28 15:02:18 -07:00
unpack-trees.h strvec: convert remaining callers away from argv_array name 2020-07-28 15:02:18 -07:00
upload-pack.c Merge branch 'rs/upload-pack-sigchain-fix' 2020-08-19 16:14:45 -07:00
upload-pack.h argv-array: rename to strvec 2020-07-28 15:02:17 -07:00
url.c
url.h
urlmatch.c
urlmatch.h
usage.c
userdiff.c userdiff: improve Fortran xfuncname regex 2020-08-13 11:21:18 -07:00
userdiff.h
utf8.c
utf8.h
varint.c
varint.h
version.c
version.h
versioncmp.c
walker.c
walker.h
wildmatch.c
wildmatch.h
worktree.c worktree: retire special-case normalization of main worktree path 2020-07-31 19:56:11 -07:00
worktree.h
wrap-for-bin.sh
wrapper.c
write-or-die.c
ws.c
wt-status.c Merge branch 'jk/strvec' 2020-08-10 10:23:57 -07:00
wt-status.h
xdiff-interface.c
xdiff-interface.h
zlib.c

Build status

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-<commandname>.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://lore.kernel.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