Go to file
Taylor Blau b7d6f23a17 midx-write.c: use `--stdin-packs` when repacking
When constructing a new pack `git multi-pack-index repack` provides a
list of objects which is the union of objects in all MIDX'd packs which
were "included" in the repack.

Though correct, this typically yields a poorly structured pack, since
providing the objects list over stdin does not give pack-objects a
chance to discover the namehash values for each object, leading to
sub-optimal delta selection.

We can use `--stdin-packs` instead, which has a couple of benefits:

  - it does a supplemental walk over objects in the supplied list of
    packs to discover their namehash, leading to higher-quality delta
    selection

  - it requires us to list far less data over stdin; instead of listing
    each object in the resulting pack, we need only list the
    constituent packs from which those objects were selected in the MIDX

Of course, this comes at a slight cost: though we save time on listing
packs versus objects over stdin[^1] (around ~650 milliseconds), we add a
non-trivial amount of time walking over the given objects in order to
find better deltas.

In general, this is likely to more closely match the user's expectations
(i.e. that packs generated via `git multi-pack-index repack` are written
with high-quality deltas). But if not, we can always introduce a new
option in pack-objects to disable the supplemental object walk, which
would yield a pure CPU-time savings, at the cost of the on-disk size of
the resulting pack.

[^1]: In a patched version of Git that doesn't perform the supplemental
  object walk in `pack-objects --stdin-packs`, we save around ~650ms
  (from 5.968 to 5.325 seconds) when running `git multi-pack-index
  repack --batch-size=0` on git.git with all objects packed, and all
  packs in a MIDX.

Signed-off-by: Taylor Blau <me@ttaylorr.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2024-04-01 14:18:17 -07:00
.github Merge branch 'pb/ci-win-artifact-names-fix' 2024-03-21 14:55:13 -07:00
Documentation The thirteenth batch 2024-04-01 13:21:36 -07:00
block-sha1
builtin Merge branch 'jk/rebase-apply-leakfix' 2024-04-01 13:21:35 -07:00
ci fuzz: add fuzzer for config parsing 2024-03-15 10:47:05 -07:00
compat Merge branch 'jc/no-include-of-compat-util-from-headers' 2024-03-05 09:44:42 -08:00
contrib Merge branch 'jk/drop-hg-to-git' 2024-03-28 14:13:51 -07:00
ewah
git-gui
gitk-git
gitweb
mergetools mergetools: vimdiff: use correct tool's name when reading mergetool config 2024-02-19 08:45:14 -08:00
negotiator
oss-fuzz fuzz: add fuzzer for config parsing 2024-03-15 10:47:05 -07:00
perl
po l10n: zh_TW: Git 2.44 2024-02-18 21:03:43 +08:00
refs Merge branch 'ps/reftable-reflog-iteration-perf' 2024-03-21 14:55:13 -07:00
reftable Merge branch 'ps/reftable-unit-test-nfs-workaround' 2024-04-01 13:21:35 -07:00
sha1
sha1collisiondetection@855827c583
sha1dc
sha256
t Merge branch 'ps/clone-with-includeif-onbranch' 2024-04-01 13:21:36 -07:00
templates
trace2
xdiff
.cirrus.yml
.clang-format
.editorconfig
.gitattributes
.gitignore
.gitlab-ci.yml
.gitmodules
.mailmap
.tsan-suppressions
CODE_OF_CONDUCT.md
COPYING
GIT-VERSION-GEN The fourth batch 2024-03-05 09:44:44 -08:00
INSTALL
LGPL-2.1
Makefile midx-write: move writing-related functions from midx.c 2024-04-01 14:18:16 -07:00
README.md Merge branch 'jc/majordomo-to-subspace' into maint-2.43 2024-02-13 14:44:50 -08:00
RelNotes Start the 2.45 cycle 2024-02-26 18:10:25 -08:00
SECURITY.md
abspath.c
abspath.h
aclocal.m4
add-interactive.c
add-interactive.h
add-patch.c
advice.c sequencer: allow disabling conflict advice 2024-03-18 09:28:40 -07:00
advice.h sequencer: allow disabling conflict advice 2024-03-18 09:28:40 -07:00
alias.c
alias.h
alloc.c
alloc.h
apply.c Merge branch 'jc/am-whitespace-doc' 2024-02-27 16:04:31 -08:00
apply.h
archive-tar.c
archive-zip.c
archive.c Merge branch 'eb/hash-transition' 2024-03-28 14:13:50 -07:00
archive.h
attr.c
attr.h
banned.h
base85.c
base85.h
bisect.c commit-reach(repo_get_merge_bases_many): pass on "missing commits" errors 2024-02-29 08:06:01 -08:00
bisect.h
blame.c
blame.h
blob.c
blob.h
bloom.c
bloom.h
branch.c branch: advise about ref syntax rules 2024-03-05 13:04:26 -08:00
branch.h
builtin.h
bulk-checkin.c
bulk-checkin.h
bundle-uri.c
bundle-uri.h
bundle.c
bundle.h
cache-tree.c Merge branch 'eb/hash-transition' 2024-03-28 14:13:50 -07:00
cache-tree.h
cbtree.c
cbtree.h
chdir-notify.c
chdir-notify.h
check-builtins.sh
checkout.c
checkout.h
chunk-format.c
chunk-format.h
color.c
color.h
column.c
column.h
combine-diff.c Merge branch 'js/check-null-from-read-object-file' 2024-02-14 15:36:06 -08:00
command-list.txt
commit-graph.c
commit-graph.h
commit-reach.c commit-reach(repo_get_merge_bases_many_dirty): pass on errors 2024-02-29 08:06:01 -08:00
commit-reach.h commit-reach(repo_get_merge_bases_many_dirty): pass on errors 2024-02-29 08:06:01 -08:00
commit-slab-decl.h
commit-slab-impl.h
commit-slab.h
commit.c Merge branch 'eb/hash-transition' 2024-03-28 14:13:50 -07:00
commit.h Merge branch 'eb/hash-transition' 2024-03-28 14:13:50 -07:00
common-main.c
config.c Merge branch 'ds/config-internal-whitespace-fix' 2024-04-01 13:21:34 -07:00
config.h
config.mak.dev
config.mak.in
config.mak.uname build: support z/OS (OS/390). 2024-03-06 08:10:58 -08:00
configure.ac
connect.c
connect.h
connected.c
connected.h
convert.c
convert.h
copy.c
copy.h
credential.c
credential.h
csum-file.c
csum-file.h
ctype.c
daemon.c
date.c date: make "iso-strict" conforming for the UTC timezone 2024-03-13 16:06:52 -07:00
date.h
decorate.c
decorate.h
delta-islands.c Merge branch 'eb/hash-transition' 2024-03-28 14:13:50 -07:00
delta-islands.h
delta.h
detect-compiler
diagnose.c
diagnose.h
diff-delta.c
diff-lib.c Merge branch 'eb/hash-transition' 2024-03-28 14:13:50 -07:00
diff-merges.c
diff-merges.h
diff-no-index.c
diff.c diff: add diff.srcPrefix and diff.dstPrefix configuration variables 2024-03-15 10:04:45 -07:00
diff.h
diffcore-break.c
diffcore-delta.c
diffcore-order.c
diffcore-pickaxe.c
diffcore-rename.c
diffcore-rotate.c
diffcore.h
dir-iterator.c dir-iterator: support iteration in sorted order 2024-02-21 09:58:05 -08:00
dir-iterator.h dir-iterator: support iteration in sorted order 2024-02-21 09:58:05 -08:00
dir.c dir: create untracked_cache_invalidate_trimmed_path() 2024-02-26 15:34:02 -08:00
dir.h dir: create untracked_cache_invalidate_trimmed_path() 2024-02-26 15:34:02 -08:00
editor.c
editor.h
entry.c
entry.h
environment.c Merge branch 'jc/no-lazy-fetch' 2024-03-07 15:59:40 -08:00
environment.h git: extend --no-lazy-fetch to work across subprocesses 2024-02-27 09:53:14 -08:00
exec-cmd.c
exec-cmd.h
fetch-negotiator.c
fetch-negotiator.h
fetch-pack.c Merge branch 'sd/negotiate-trace-fix' into maint-2.43 2024-02-13 14:44:50 -08:00
fetch-pack.h
fmt-merge-msg.c
fmt-merge-msg.h
fsck.c Merge branch 'eb/hash-transition' 2024-03-28 14:13:50 -07:00
fsck.h
fsmonitor--daemon.h
fsmonitor-ipc.c
fsmonitor-ipc.h
fsmonitor-ll.h
fsmonitor-path-utils.h
fsmonitor-settings.c
fsmonitor-settings.h
fsmonitor.c fsmonitor: support case-insensitive events 2024-03-06 09:10:06 -08:00
fsmonitor.h
generate-cmdlist.sh
generate-configlist.sh
generate-hooklist.sh
gettext.c
gettext.h
git-archimport.perl
git-compat-util.h
git-curl-compat.h
git-cvsexportcommit.perl
git-cvsimport.perl
git-cvsserver.perl
git-difftool--helper.sh git-difftool--helper: honor `--trust-exit-code` with `--dir-diff` 2024-02-20 09:30:32 -08:00
git-filter-branch.sh
git-instaweb.sh
git-merge-octopus.sh
git-merge-one-file.sh
git-merge-resolve.sh
git-mergetool--lib.sh
git-mergetool.sh
git-p4.py
git-quiltimport.sh git-quiltimport: avoid an unnecessary subshell 2024-03-16 11:08:57 -07:00
git-request-pull.sh
git-send-email.perl
git-sh-i18n.sh
git-sh-setup.sh
git-submodule.sh Merge branch 'ss/pull-v-recurse-fix' 2022-12-28 12:06:17 +09:00
git-svn.perl
git-web--browse.sh
git-zlib.c
git-zlib.h
git.c Merge branch 'jh/trace2-missing-def-param-fix' 2024-03-18 13:04:25 -07:00
git.rc
gpg-interface.c
gpg-interface.h
graph.c
graph.h
grep.c
grep.h
hash-ll.h
hash-lookup.c
hash-lookup.h
hash.h
hashmap.c
hashmap.h
help.c
help.h
hex-ll.c
hex-ll.h
hex.c
hex.h
hook.c
hook.h
http-backend.c
http-fetch.c
http-push.c Merge branch 'eb/hash-transition' 2024-03-28 14:13:50 -07:00
http-walker.c
http.c
http.h
ident.c
ident.h
imap-send.c
iterator.h
json-writer.c
json-writer.h
khash.h
kwset.c
kwset.h
levenshtein.c
levenshtein.h
line-log.c
line-log.h
line-range.c
line-range.h
linear-assignment.c
linear-assignment.h
list-objects-filter-options.c
list-objects-filter-options.h
list-objects-filter.c oidset: refactor oidset_insert_from_set() 2024-02-14 09:39:14 -08:00
list-objects-filter.h
list-objects.c Merge branch 'eb/hash-transition' 2024-03-28 14:13:50 -07:00
list-objects.h
list.h
lockfile.c
lockfile.h lockfile: report when rollback fails 2024-03-07 12:34:13 -08:00
log-tree.c Merge branch 'jk/pretty-subject-cleanup' 2024-04-01 13:21:34 -07:00
log-tree.h format-patch: return an allocated string from log_write_email_headers() 2024-03-19 17:54:16 -07:00
loose.c
loose.h
ls-refs.c
ls-refs.h
mailinfo.c
mailinfo.h
mailmap.c
mailmap.h
match-trees.c
match-trees.h
mem-pool.c mem-pool: add mem_pool_strfmt() 2024-02-26 09:35:40 -08:00
mem-pool.h mem-pool: add mem_pool_strfmt() 2024-02-26 09:35:40 -08:00
merge-blobs.c
merge-blobs.h
merge-ll.c Merge branch 'pw/checkout-conflict-errorfix' 2024-04-01 13:21:33 -07:00
merge-ll.h merge options: add a conflict style member 2024-03-14 10:08:52 -07:00
merge-ort-wrappers.c
merge-ort-wrappers.h
merge-ort.c Merge branch 'pw/checkout-conflict-errorfix' 2024-04-01 13:21:33 -07:00
merge-ort.h
merge-recursive.c Merge branch 'pw/checkout-conflict-errorfix' 2024-04-01 13:21:33 -07:00
merge-recursive.h merge options: add a conflict style member 2024-03-14 10:08:52 -07:00
merge.c Merge branch 'eb/hash-transition' 2024-03-28 14:13:50 -07:00
merge.h
mergesort.h
midx-write.c midx-write.c: use `--stdin-packs` when repacking 2024-04-01 14:18:17 -07:00
midx.c midx-write: move writing-related functions from midx.c 2024-04-01 14:18:16 -07:00
midx.h midx-write: move writing-related functions from midx.c 2024-04-01 14:18:16 -07:00
name-hash.c name-hash: add index_dir_find() 2024-02-26 15:34:01 -08:00
name-hash.h name-hash: add index_dir_find() 2024-02-26 15:34:01 -08:00
notes-cache.c
notes-cache.h
notes-merge.c commit-reach(repo_get_merge_bases): pass on "missing commits" errors 2024-02-29 08:06:01 -08:00
notes-merge.h
notes-utils.c
notes-utils.h
notes.c
notes.h
object-file-convert.c
object-file-convert.h
object-file.c Merge branch 'eb/hash-transition' 2024-03-28 14:13:50 -07:00
object-file.h
object-name.c Merge branch 'eb/hash-transition' 2024-03-28 14:13:50 -07:00
object-name.h
object-store-ll.h
object-store.h
object.c Merge branch 'eb/hash-transition' 2024-03-28 14:13:50 -07:00
object.h Merge branch 'eb/hash-transition' 2024-03-28 14:13:50 -07:00
oid-array.c
oid-array.h
oidmap.c
oidmap.h
oidset.c oidset: refactor oidset_insert_from_set() 2024-02-14 09:39:14 -08:00
oidset.h oidset: refactor oidset_insert_from_set() 2024-02-14 09:39:14 -08:00
oidtree.c
oidtree.h
pack-bitmap-write.c Merge branch 'eb/hash-transition' 2024-03-28 14:13:50 -07:00
pack-bitmap.c
pack-bitmap.h
pack-check.c
pack-mtimes.c
pack-mtimes.h
pack-objects.c
pack-objects.h
pack-revindex.c
pack-revindex.h
pack-write.c
pack.h
packfile.c Merge branch 'eb/hash-transition' 2024-03-28 14:13:50 -07:00
packfile.h
pager.c
pager.h
parallel-checkout.c
parallel-checkout.h
parse-options-cb.c
parse-options.c parse-options: rearrange long_name matching code 2024-03-03 09:49:22 -08:00
parse-options.h
parse.c
parse.h
patch-delta.c
patch-ids.c
patch-ids.h
path.c
path.h
pathspec.c
pathspec.h
pkt-line.c
pkt-line.h
preload-index.c
preload-index.h
pretty.c Merge branch 'jk/pretty-subject-cleanup' 2024-04-01 13:21:34 -07:00
pretty.h format-patch: return an allocated string from log_write_email_headers() 2024-03-19 17:54:16 -07:00
prio-queue.c
prio-queue.h
progress.c
progress.h
promisor-remote.c
promisor-remote.h
prompt.c
prompt.h
protocol-caps.c
protocol-caps.h
protocol.c
protocol.h
prune-packed.c
prune-packed.h
quote.c
quote.h
range-diff.c
range-diff.h
reachable.c
reachable.h
read-cache-ll.h
read-cache.c
read-cache.h
rebase-interactive.c
rebase-interactive.h
rebase.c
rebase.h
ref-filter.c Merge branch 'la/trailer-api' 2024-03-14 14:05:24 -07:00
ref-filter.h for-each-ref: add new option to include root refs 2024-02-23 10:36:28 -08:00
reflog-walk.c
reflog-walk.h
reflog.c Merge branch 'eb/hash-transition' 2024-03-28 14:13:50 -07:00
reflog.h
refs.c Merge branch 'kn/for-all-refs' 2024-03-05 09:44:44 -08:00
refs.h Merge branch 'kn/for-all-refs' 2024-03-05 09:44:44 -08:00
refspec.c
refspec.h
remote-curl.c
remote.c Merge branch 'js/merge-base-with-missing-commit' 2024-03-11 14:12:30 -07:00
remote.h
replace-object.c
replace-object.h
repo-settings.c
repository.c Merge branch 'eb/hash-transition' 2024-03-28 14:13:50 -07:00
repository.h Merge branch 'eb/hash-transition' 2024-03-28 14:13:50 -07:00
rerere.c Merge branch 'js/check-null-from-read-object-file' 2024-02-14 15:36:06 -08:00
rerere.h
reset.c Merge branch 'js/merge-tree-3-trees' 2024-03-07 15:59:41 -08:00
reset.h
resolve-undo.c
resolve-undo.h
revision.c Merge branch 'eb/hash-transition' 2024-03-28 14:13:50 -07:00
revision.h
run-command.c
run-command.h
sane-ctype.h
scalar.c
send-pack.c
send-pack.h
sequencer.c Merge branch 'pb/advice-merge-conflict' 2024-04-01 13:21:34 -07:00
sequencer.h rebase -i: stop setting GIT_CHERRY_PICK_HELP 2024-02-27 10:33:36 -08:00
serve.c upload-pack: disallow object-info capability by default 2024-02-28 14:42:01 -08:00
serve.h
server-info.c
server-info.h
setup.c Merge branch 'eb/hash-transition' 2024-03-28 14:13:50 -07:00
setup.h Merge branch 'eb/hash-transition' 2024-03-28 14:13:50 -07:00
sh-i18n--envsubst.c
sha1dc_git.c
sha1dc_git.h
shallow.c commit-reach(repo_in_merge_bases_many): report missing commits 2024-02-28 09:47:03 -08:00
shallow.h
shared.mak
shell.c
shortlog.h
sideband.c sideband: avoid short write(2) 2024-03-02 11:12:16 -08:00
sideband.h
sigchain.c
sigchain.h
simple-ipc.h
sparse-index.c
sparse-index.h
split-index.c
split-index.h
stable-qsort.c
statinfo.c
statinfo.h
strbuf.c
strbuf.h
streaming.c
streaming.h
string-list.c
string-list.h
strmap.c
strmap.h
strvec.c
strvec.h
sub-process.c
sub-process.h
submodule-config.c
submodule-config.h
submodule.c Merge branch 'js/merge-base-with-missing-commit' 2024-03-11 14:12:30 -07:00
submodule.h
symlinks.c
symlinks.h
tag.c
tag.h
tar.h
tempfile.c lockfile: report when rollback fails 2024-03-07 12:34:13 -08:00
tempfile.h lockfile: report when rollback fails 2024-03-07 12:34:13 -08:00
thread-utils.c
thread-utils.h
tmp-objdir.c
tmp-objdir.h
trace.c
trace.h
trace2.c trace2: emit 'def_param' set with 'cmd_name' event 2024-03-07 10:24:34 -08:00
trace2.h
trailer.c Merge branch 'la/trailer-api' 2024-03-14 14:05:24 -07:00
trailer.h format_trailers(): use strbuf instead of FILE 2024-03-01 10:35:42 -08:00
transport-helper.c Merge branch 'as/option-names-in-messages' 2024-03-15 16:05:59 -07:00
transport-internal.h
transport.c
transport.h
tree-diff.c
tree-walk.c Merge branch 'eb/hash-transition' 2024-03-28 14:13:50 -07:00
tree-walk.h Merge branch 'eb/hash-transition' 2024-03-28 14:13:50 -07:00
tree.c Merge branch 'eb/hash-transition' 2024-03-28 14:13:50 -07:00
tree.h
unicode-width.h
unimplemented.sh
unix-socket.c
unix-socket.h
unix-stream-server.c
unix-stream-server.h
unpack-trees.c
unpack-trees.h
upload-pack.c Merge branch 'jk/upload-pack-v2-capability-cleanup' 2024-03-07 15:59:42 -08:00
upload-pack.h
url.c
url.h
urlmatch.c
urlmatch.h
usage.c
userdiff.c Merge branch 'jk/textconv-cache-outside-repo-fix' 2024-03-05 09:44:42 -08:00
userdiff.h
utf8.c
utf8.h
varint.c
varint.h
version.c
version.h
versioncmp.c
versioncmp.h
walker.c
walker.h
wildmatch.c
wildmatch.h
worktree.c
worktree.h
wrap-for-bin.sh
wrapper.c
wrapper.h
write-or-die.c
write-or-die.h
ws.c
ws.h
wt-status.c Merge branch 'fs/find-end-of-log-message-fix' 2024-03-21 14:55:12 -07:00
wt-status.h status: unify parsing of --untracked= and status.showUntrackedFiles 2024-03-13 10:43:32 -07:00
xdiff-interface.c xdiff-interface: refactor parsing of merge.conflictstyle 2024-03-14 10:08:52 -07:00
xdiff-interface.h xdiff-interface: refactor parsing of merge.conflictstyle 2024-03-14 10:08:52 -07:00

README.md

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 and Documentation/CodingGuidelines).

Those wishing to help with error message, usage and informational message string translations (localization l10) should see po/README.md (a po file is a Portable Object file that holds the translations).

To subscribe to the list, send an email to git+subscribe@vger.kernel.org (see https://subspace.kernel.org/subscribing.html for details). The mailing list archives are available at https://lore.kernel.org/git/, https://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