Go to file
Taylor Blau e199290592 pack-objects: only perform verbatim reuse on the preferred pack
When reusing objects from source pack(s), write_reused_pack_verbatim()
is responsible for reusing objects whole eword_t's at a time. It works
by taking the longest continuous run of objects from the beginning of
each source pack that the caller wants, and reuses the entirety of that
section from each pack.

This is based on the assumption that we don't have any gaps within the
region. This assumption relieves us from having to patch any
OFS_DELTAs, since we know that there aren't any gaps between any delta
and its base in that region.

To illustrate why this assumption is necessary, suppose we have some
pack P, which has objects X, Y, and Z. If the MIDX's copy of Y was
selected from a pack other than P, then the bit corresponding to object
Y will appear earlier in the bitmap than the bits corresponding to X and
Z.

If pack-objects already has or will use the copy of Y from the pack it
was selected from in the MIDX, then it is an error to reuse all objects
between X and Z in the source pack. Doing so will cause us to reuse Y
from a different pack than the one which represents Y in the MIDX,
causing us to either:

 - include the object twice, assuming that the caller wants Y in the
   pack, or

 - include the object once, resulting in us packing more objects than
   necessary.

This regression comes from ca0fd69e37 (pack-objects: prepare
`write_reused_pack_verbatim()` for multi-pack reuse, 2023-12-14), which
incorrectly assumed that there would be no gaps in reusable regions of
non-preferred packs.

Instead, we can only safely perform the whole-word reuse optimization on
the preferred pack, where we know with certainty that no gaps exist in
that region of the bitmap. We can still reuse objects from non-preferred
packs, but we have to inspect them individually in write_reused_pack()
to ensure that any gaps that may exist are accounted for.

This allows us to simplify the implementation of
write_reused_pack_verbatim() back to almost its pre-multi-pack reuse
form, since we can now assume that the beginning of the pack appears at
the beginning of the bitmap, meaning that we don't have to account for
any bits up to the first word boundary (like we had to special case in
ca0fd69e37).

The only significant changes from the pre-ca0fd69e37 implementation are:

 - that we can no longer inspect words up to the end of
   reuse_packfile_bitmap->word_alloc, since we only want to look at
   words whose bits all correspond to objects in the given packfile, and

 - that we return early when given a reuse_packfile which is not
   preferred, making the call a noop.

In the future, it might be possible to restore this optimization if we
could guarantee that some reuse packs don't contain any gaps by
construction (similar to the "disjoint packs" idea in very early
versions of multi-pack reuse).

Helped-by: Jeff King <peff@peff.net>
Signed-off-by: Taylor Blau <me@ttaylorr.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2024-11-15 09:13:31 +09:00
.github Merge branch 'jk/ci-linux32-update' 2024-09-16 15:27:08 -07:00
Documentation Mostly there for 2.47 final 2024-10-04 14:21:44 -07:00
block-sha1 sha1: do not redefine `platform_SHA_CTX` and friends 2024-09-27 11:27:47 -07:00
builtin pack-objects: only perform verbatim reuse on the preferred pack 2024-11-15 09:13:31 +09:00
ci Merge branch 'jk/ci-linux32-update' 2024-09-16 15:27:08 -07:00
compat Merge branch 'ps/environ-wo-the-repository' 2024-09-23 10:35:05 -07:00
contrib Merge branch 'jc/cmake-unit-test-updates' 2024-09-25 10:37:13 -07:00
ewah
git-gui Merge https://github.com/j6t/git-gui 2024-07-07 22:50:59 -07:00
gitk-git
gitweb Merge branch 'am/gitweb-feed-use-committer-date' 2024-07-15 10:11:41 -07:00
mergetools Merge branch 'ak/typofix-2.46-maint' 2024-10-04 14:21:40 -07:00
negotiator Merge branch 'ps/leakfixes-part-6' 2024-09-20 11:16:30 -07:00
oss-fuzz oss-fuzz: mark unused argv/argc argument 2024-08-17 09:46:11 -07:00
perl Merge branch 'ak/typofix-2.46-maint' 2024-10-04 14:21:40 -07:00
po Merge branch 'l10n-de-2.47' of github.com:ralfth/git 2024-10-06 12:06:21 +08:00
refs Merge branch 'ps/reftable-concurrent-writes' 2024-09-30 16:16:14 -07:00
reftable Merge branch 'ak/typofix-2.46-maint' 2024-10-04 14:21:40 -07:00
sha1 sha1: do not redefine `platform_SHA_CTX` and friends 2024-09-27 11:27:47 -07:00
sha1collisiondetection@855827c583
sha1dc
sha256
t pack-objects: only perform verbatim reuse on the preferred pack 2024-11-15 09:13:31 +09:00
templates
trace2 Merge branch 'ak/typofix-2.46-maint' 2024-10-04 14:21:40 -07:00
xdiff
.cirrus.yml ci: update FreeBSD image to 13.4 2024-09-20 14:40:41 -07:00
.clang-format Merge branch 'rs/unit-tests-test-run' 2024-08-19 11:07:36 -07:00
.editorconfig
.gitattributes
.gitignore Makefile: wire up the clar unit testing framework 2024-09-04 08:41:37 -07:00
.gitlab-ci.yml Merge branch 'ps/ci-gitlab-upgrade' 2024-09-25 10:37:13 -07:00
.gitmodules
.mailmap .mailmap document current address. 2024-09-06 09:31:15 -07:00
.tsan-suppressions
CODE_OF_CONDUCT.md
COPYING
GIT-VERSION-GEN Git 2.47 2024-10-06 15:56:06 -07:00
INSTALL
LGPL-2.1
Makefile Merge branch 'tb/weak-sha1-for-tail-sum' 2024-10-02 07:46:27 -07:00
README.md
RelNotes Start preparing for Git 2.46.2 2024-09-16 15:19:05 -07:00
SECURITY.md
abspath.c
abspath.h
aclocal.m4
add-interactive.c global: introduce `USE_THE_REPOSITORY_VARIABLE` macro 2024-06-14 10:26:33 -07:00
add-interactive.h
add-patch.c Merge branch 'ps/config-wo-the-repository' 2024-08-23 09:02:34 -07:00
advice.c Merge branch 'ds/advice-sparse-index-expansion' 2024-07-16 11:18:56 -07:00
advice.h Merge branch 'ds/advice-sparse-index-expansion' 2024-07-16 11:18:56 -07:00
alias.c config: make dependency on repo in `read_early_config()` explicit 2024-09-12 10:15:40 -07:00
alias.h
alloc.c
alloc.h
apply.c Merge branch 'ps/apply-leakfix' 2024-09-25 10:37:10 -07:00
apply.h apply: support --ours, --theirs, and --union for three-way merges 2024-09-09 10:07:24 -07:00
archive-tar.c global: introduce `USE_THE_REPOSITORY_VARIABLE` macro 2024-06-14 10:26:33 -07:00
archive-zip.c global: introduce `USE_THE_REPOSITORY_VARIABLE` macro 2024-06-14 10:26:33 -07:00
archive.c Merge branch 'rs/archive-with-attr-pathspec-fix' 2024-10-04 14:21:40 -07:00
archive.h
attr.c Merge branch 'ak/typofixes' 2024-09-23 10:35:07 -07:00
attr.h Merge branch 'jc/varargs-attributes' 2024-06-17 15:55:55 -07:00
banned.h
base85.c
base85.h
bisect.c Merge branch 'ps/pack-refs-auto-heuristics' 2024-09-12 11:47:23 -07:00
bisect.h
blame.c Merge branch 'ps/leakfixes-more' 2024-07-08 14:53:10 -07:00
blame.h
blob.c
blob.h
bloom.c Merge branch 'tb/path-filter-fix' 2024-07-08 14:53:10 -07:00
bloom.h Merge branch 'ak/typofixes' 2024-09-23 10:35:07 -07:00
branch.c branch: stop modifying `log_all_ref_updates` variable 2024-09-12 10:15:43 -07:00
branch.h
builtin.h builtin: remove USE_THE_REPOSITORY_VARIABLE from builtin.h 2024-09-13 14:32:24 -07:00
bulk-checkin.c environment: make `get_object_directory()` accept a repository 2024-09-12 10:15:39 -07:00
bulk-checkin.h
bundle-uri.c Merge branch 'ps/environ-wo-the-repository' 2024-09-23 10:35:05 -07:00
bundle-uri.h
bundle.c Merge branch 'ps/leakfixes-part-5' 2024-09-03 09:15:00 -07:00
bundle.h unbundle: extend object verification for fetches 2024-06-20 10:30:08 -07:00
cache-tree.c environment: make `get_git_dir()` accept a repository 2024-09-12 10:15:39 -07:00
cache-tree.h
cbtree.c cbtree: fix a typo 2024-09-16 10:46:00 -07:00
cbtree.h
chdir-notify.c
chdir-notify.h
check-builtins.sh
checkout.c global: introduce `USE_THE_REPOSITORY_VARIABLE` macro 2024-06-14 10:26:33 -07:00
checkout.h hash-ll: merge with "hash.h" 2024-06-14 10:26:33 -07:00
chunk-format.c global: introduce `USE_THE_REPOSITORY_VARIABLE` macro 2024-06-14 10:26:33 -07:00
chunk-format.h hash-ll: merge with "hash.h" 2024-06-14 10:26:33 -07:00
color.c
color.h
column.c
column.h
combine-diff.c diff: fix leaking orderfile option 2024-09-27 08:25:35 -07:00
command-list.txt
commit-graph.c commit-graph: remove unnecessary UNLEAK 2024-09-23 10:03:59 -07:00
commit-graph.h hash-ll: merge with "hash.h" 2024-06-14 10:26:33 -07:00
commit-reach.c Merge branch 'ds/for-each-ref-is-base' 2024-08-26 11:32:24 -07:00
commit-reach.h commit-reach: add get_branch_base_for_tip 2024-08-14 10:10:05 -07:00
commit-slab-decl.h
commit-slab-impl.h
commit-slab.h
commit.c commit: avoid leaking already-saved buffer 2024-09-25 10:24:53 -07:00
commit.h Merge branch 'jc/pass-repo-to-builtins' 2024-09-23 10:35:09 -07:00
common-main.c global: introduce `USE_THE_REPOSITORY_VARIABLE` macro 2024-06-14 10:26:33 -07:00
config.c config: fix evaluating "onbranch" with nonexistent git dir 2024-09-24 09:18:17 -07:00
config.h config: make dependency on repo in `read_early_config()` explicit 2024-09-12 10:15:40 -07:00
config.mak.dev Merge branch 'ak/typofix-2.46-maint' 2024-09-25 10:37:12 -07:00
config.mak.in
config.mak.uname Merge branch 'rj/cygwin-has-dev-tty' into maint-2.46 2024-09-23 10:32:59 -07:00
configure.ac
connect.c connect: clear child process before freeing in diagnostic mode 2024-09-25 10:24:53 -07:00
connect.h
connected.c global: introduce `USE_THE_REPOSITORY_VARIABLE` macro 2024-06-14 10:26:33 -07:00
connected.h
convert.c convert: fix leaks when resetting attributes 2024-08-22 09:18:03 -07:00
convert.h hash-ll: merge with "hash.h" 2024-06-14 10:26:33 -07:00
copy.c
copy.h
credential.c Merge branch 'ds/background-maintenance-with-credential' 2024-09-30 16:16:16 -07:00
credential.h
csum-file.c csum-file.c: use unsafe SHA-1 implementation when available 2024-09-27 11:27:47 -07:00
csum-file.h Merge branch 'ps/leakfixes-part-4' 2024-08-23 09:02:33 -07:00
ctype.c
daemon.c Merge branch 'jk/mark-unused-parameters' 2024-08-26 11:32:23 -07:00
date.c date: detect underflow/overflow when parsing dates with timezone offset 2024-06-25 17:07:41 -07:00
date.h
decorate.c
decorate.h
delta-islands.c refs: add referent to each_ref_fn 2024-08-09 08:47:34 -07:00
delta-islands.h
delta.h
detect-compiler
diagnose.c global: introduce `USE_THE_REPOSITORY_VARIABLE` macro 2024-06-14 10:26:33 -07:00
diagnose.h
diff-delta.c
diff-lib.c diff-lib: drop unused index argument from get_stat_data() 2024-08-17 09:44:41 -07:00
diff-merges.c
diff-merges.h
diff-no-index.c remerge-diff: clean up temporary objdir at a central place 2024-08-09 15:42:40 -07:00
diff.c Merge branch 'ps/leakfixes-part-7' 2024-10-02 07:46:26 -07:00
diff.h Merge branch 'ps/leakfixes-part-7' 2024-10-02 07:46:26 -07:00
diffcore-break.c diffcore-break: fix leaking filespecs when merging broken pairs 2024-09-27 08:25:37 -07:00
diffcore-delta.c
diffcore-order.c diffcore-order: fix leaking buffer when parsing orderfiles 2024-09-27 08:25:35 -07:00
diffcore-pickaxe.c
diffcore-rename.c diffcore-rename: fix typos 2024-09-19 13:46:00 -07:00
diffcore-rotate.c
diffcore.h hash-ll: merge with "hash.h" 2024-06-14 10:26:33 -07:00
dir-iterator.c
dir-iterator.h
dir.c Merge branch 'ps/leakfixes-part-7' 2024-10-02 07:46:26 -07:00
dir.h win32: override `fspathcmp()` with a directory separator-aware version 2024-07-13 16:23:36 -07:00
editor.c global: prepare for hiding away repo-less config functions 2024-08-13 10:01:05 -07:00
editor.h editor: do not rely on `the_repository` for interactive edits 2024-08-13 10:01:00 -07:00
entry.c entry: fix leaking pathnames during delayed checkout 2024-08-01 08:47:37 -07:00
entry.h
environment.c environment: stop storing "core.notesRef" globally 2024-09-12 10:15:44 -07:00
environment.h environment: stop storing "core.notesRef" globally 2024-09-12 10:15:44 -07:00
exec-cmd.c exec_cmd: RUNTIME_PREFIX on z/OS systems 2024-08-22 08:58:46 -07:00
exec-cmd.h
fetch-negotiator.c
fetch-negotiator.h
fetch-pack.c Merge branch 'ps/environ-wo-the-repository' 2024-09-23 10:35:05 -07:00
fetch-pack.h fetch-pack: expose fsckObjects configuration logic 2024-06-20 10:30:07 -07:00
fmt-merge-msg.c Merge branch 'ps/use-the-repository' 2024-07-02 09:59:00 -07:00
fmt-merge-msg.h
fsck.c builtin/refs: add verify subcommand 2024-08-08 09:36:53 -07:00
fsck.h fsck: add ref name check for files backend 2024-08-08 09:36:53 -07:00
fsmonitor--daemon.h
fsmonitor-ipc.c global: introduce `USE_THE_REPOSITORY_VARIABLE` macro 2024-06-14 10:26:33 -07:00
fsmonitor-ipc.h
fsmonitor-ll.h
fsmonitor-path-utils.h
fsmonitor-settings.c fsmonitor-settings: fix a typo 2024-09-19 13:46:00 -07:00
fsmonitor-settings.h
fsmonitor.c environment: make `get_git_work_tree()` accept a repository 2024-09-12 10:15:40 -07:00
fsmonitor.h
generate-cmdlist.sh
generate-configlist.sh
generate-hooklist.sh
gettext.c
gettext.h
git-archimport.perl
git-compat-util.h CodingGuidelines: also mention MAYBE_UNUSED 2024-08-29 11:28:07 -07:00
git-curl-compat.h
git-cvsexportcommit.perl
git-cvsimport.perl
git-cvsserver.perl
git-difftool--helper.sh
git-filter-branch.sh
git-instaweb.sh git-instaweb: fix a typo 2024-09-19 13:46:00 -07:00
git-merge-octopus.sh
git-merge-one-file.sh
git-merge-resolve.sh
git-mergetool--lib.sh
git-mergetool.sh
git-p4.py git-p4: fix typos 2024-09-19 13:46:00 -07:00
git-quiltimport.sh
git-request-pull.sh
git-send-email.perl Merge branch 'jk/send-email-mailmap' 2024-09-06 10:38:49 -07:00
git-sh-i18n.sh
git-sh-setup.sh
git-submodule.sh builtin/submodule: allow "add" to use different ref storage format 2024-08-08 09:22:21 -07:00
git-svn.perl git-svn: mention `svn:global-ignores` in help+docs 2024-08-14 15:10:24 -07:00
git-web--browse.sh
git-zlib.c
git-zlib.h
git.c Merge branch 'ps/leakfixes-part-7' 2024-10-02 07:46:26 -07:00
git.rc
gpg-interface.c Merge branch 'ak/typofix-2.46-maint' 2024-09-25 10:37:12 -07:00
gpg-interface.h gpg-interface: fix misdesigned signing key interfaces 2024-09-05 08:49:11 -07:00
graph.c global: prepare for hiding away repo-less config functions 2024-08-13 10:01:05 -07:00
graph.h
grep.c grep: fix leaking grep pattern 2024-09-27 08:25:36 -07:00
grep.h
hash-lookup.c global: introduce `USE_THE_REPOSITORY_VARIABLE` macro 2024-06-14 10:26:33 -07:00
hash-lookup.h
hash.h hash.h: set NEEDS_CLONE_HELPER_UNSAFE in fallback mode 2024-10-03 11:18:36 -07:00
hashmap.c
hashmap.h
help.c Merge branch 'jc/pass-repo-to-builtins' 2024-09-23 10:35:09 -07:00
help.h builtin/merge: fix leaking `struct cmdnames` in `get_strategy()` 2024-06-11 13:15:07 -07:00
hex-ll.c
hex-ll.h
hex.c global: introduce `USE_THE_REPOSITORY_VARIABLE` macro 2024-06-14 10:26:33 -07:00
hex.h hex: guard declarations with `USE_THE_REPOSITORY_VARIABLE` 2024-06-14 10:26:35 -07:00
hook.c hooks: remove implicit dependency on `the_repository` 2024-08-13 10:01:01 -07:00
hook.h hooks: remove implicit dependency on `the_repository` 2024-08-13 10:01:01 -07:00
http-backend.c environment: make `get_object_directory()` accept a repository 2024-09-12 10:15:39 -07:00
http-fetch.c http-fetch: clear leaking git-index-pack(1) arguments 2024-09-25 10:24:52 -07:00
http-push.c http-push: clean up local_refs at exit 2024-09-25 10:24:58 -07:00
http-walker.c http-walker: free fake packed_git list 2024-09-25 10:24:56 -07:00
http.c Merge branch 'jk/http-leakfixes' 2024-10-02 07:46:26 -07:00
http.h http: fix leak of http_object_request struct 2024-09-25 10:24:55 -07:00
ident.c
ident.h
imap-send.c Merge branch 'jk/no-openssl-with-openssl-sha1' 2024-09-20 11:16:31 -07:00
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: plug leaking find functions 2024-06-11 13:15:08 -07:00
line-range.h
linear-assignment.c
linear-assignment.h
list-objects-filter-options.c global: introduce `USE_THE_REPOSITORY_VARIABLE` macro 2024-06-14 10:26:33 -07:00
list-objects-filter-options.h
list-objects-filter.c Merge branch 'ps/leakfixes-more' 2024-07-08 14:53:10 -07:00
list-objects-filter.h
list-objects.c global: introduce `USE_THE_REPOSITORY_VARIABLE` macro 2024-06-14 10:26:33 -07:00
list-objects.h
list.h
lockfile.c
lockfile.h
log-tree.c Merge branch 'jc/range-diff-lazy-setup' 2024-09-16 14:22:55 -07:00
log-tree.h
loose.c drop trailing newline from warning/error/die messages 2024-09-05 09:07:12 -07:00
loose.h hash-ll: merge with "hash.h" 2024-06-14 10:26:33 -07:00
ls-refs.c refs: add referent to each_ref_fn 2024-08-09 08:47:34 -07:00
ls-refs.h
mailinfo.c Merge branch 'jc/mailinfo-header-cleanup' 2024-09-12 11:47:22 -07:00
mailinfo.h
mailmap.c Merge branch 'jk/send-email-mailmap' 2024-09-06 10:38:49 -07:00
mailmap.h check-mailmap: add options for additional mailmap sources 2024-08-27 14:51:29 -07:00
match-trees.c match-trees: fix leaking prefixes in `shift_tree()` 2024-09-05 08:49:12 -07:00
match-trees.h
mem-pool.c
mem-pool.h
merge-blobs.c global: introduce `USE_THE_REPOSITORY_VARIABLE` macro 2024-06-14 10:26:33 -07:00
merge-blobs.h
merge-ll.c Merge branch 'ak/typofix-2.46-maint' 2024-09-25 10:37:12 -07:00
merge-ll.h
merge-ort-wrappers.c merge: fix leaking merge bases 2024-06-11 13:15:08 -07:00
merge-ort-wrappers.h merge: fix leaking merge bases 2024-06-11 13:15:08 -07:00
merge-ort.c Merge branch 'ak/typofix-2.46-maint' 2024-09-25 10:37:12 -07:00
merge-ort.h Merge branch 'ps/leakfixes-more' 2024-07-08 14:53:10 -07:00
merge-recursive.c merge-recursive: honor diff.algorithm 2024-07-13 18:10:49 -07:00
merge-recursive.h merge-recursive: honor diff.algorithm 2024-07-13 18:10:49 -07:00
merge.c global: introduce `USE_THE_REPOSITORY_VARIABLE` macro 2024-06-14 10:26:33 -07:00
merge.h
mergesort.h
midx-write.c Merge branch 'ps/leakfixes-part-5' 2024-09-03 09:15:00 -07:00
midx.c pack-bitmap: tag bitmapped packs with their corresponding MIDX 2024-08-27 14:50:26 -07:00
midx.h midx: implement support for writing incremental MIDX chains 2024-08-06 12:01:39 -07:00
name-hash.c environment: guard state depending on a repository 2024-09-12 10:15:42 -07:00
name-hash.h
notes-cache.c global: introduce `USE_THE_REPOSITORY_VARIABLE` macro 2024-06-14 10:26:33 -07:00
notes-cache.h
notes-merge.c Merge branch 'ps/leakfixes-more' 2024-07-08 14:53:10 -07:00
notes-merge.h
notes-utils.c Merge branch 'ps/leakfixes-more' 2024-07-08 14:53:10 -07:00
notes-utils.h commit: fix leaking parents when calling `commit_tree_extended()` 2024-06-11 13:15:07 -07:00
notes.c environment: stop storing "core.notesRef" globally 2024-09-12 10:15:44 -07:00
notes.h environment: stop storing "core.notesRef" globally 2024-09-12 10:15:44 -07:00
object-file-convert.c hash-ll: merge with "hash.h" 2024-06-14 10:26:33 -07:00
object-file-convert.h
object-file.c Merge branch 'tb/weak-sha1-for-tail-sum' 2024-10-02 07:46:27 -07:00
object-file.h finalize_object_file(): implement collision check 2024-09-27 11:27:47 -07:00
object-name.c environment: stop storing "core.warnAmbiguousRefs" globally 2024-09-12 10:15:44 -07:00
object-name.h object-name: free leaking object contexts 2024-06-11 13:15:05 -07:00
object-store-ll.h environment: move object database functions into object layer 2024-09-12 10:15:40 -07:00
object-store.h
object.c object: clear grafts when clearing parsed object pool 2024-09-05 08:49:11 -07:00
object.h object: clear grafts when clearing parsed object pool 2024-09-05 08:49:11 -07:00
oid-array.c global: introduce `USE_THE_REPOSITORY_VARIABLE` macro 2024-06-14 10:26:33 -07:00
oid-array.h
oidmap.c
oidmap.h hash-ll: merge with "hash.h" 2024-06-14 10:26:33 -07:00
oidset.c oidset: pass hash algorithm when parsing file 2024-06-14 10:26:34 -07:00
oidset.h oidset: pass hash algorithm when parsing file 2024-06-14 10:26:34 -07:00
oidtree.c global: ensure that object IDs are always padded 2024-06-14 10:26:32 -07:00
oidtree.h hash-ll: merge with "hash.h" 2024-06-14 10:26:33 -07:00
pack-bitmap-write.c Merge branch 'jk/drop-unused-parameters' 2024-08-26 11:32:22 -07:00
pack-bitmap.c pack-bitmap.c: avoid repeated `pack_pos_to_offset()` during reuse 2024-08-27 14:50:27 -07:00
pack-bitmap.h pack-bitmap: tag bitmapped packs with their corresponding MIDX 2024-08-27 14:50:26 -07:00
pack-check.c global: introduce `USE_THE_REPOSITORY_VARIABLE` macro 2024-06-14 10:26:33 -07:00
pack-mtimes.c
pack-mtimes.h
pack-objects.c
pack-objects.h
pack-revindex.c Merge branch 'ps/use-the-repository' 2024-07-02 09:59:00 -07:00
pack-revindex.h
pack-write.c Merge branch 'tb/weak-sha1-for-tail-sum' 2024-10-02 07:46:27 -07:00
pack.h
packfile.c environment: make `get_object_directory()` accept a repository 2024-09-12 10:15:39 -07:00
packfile.h midx: implement support for writing incremental MIDX chains 2024-08-06 12:01:39 -07:00
pager.c config: make dependency on repo in `read_early_config()` explicit 2024-09-12 10:15:40 -07:00
pager.h pager: introduce wait_for_pager 2024-07-25 09:03:00 -07:00
parallel-checkout.c global: prepare for hiding away repo-less config functions 2024-08-13 10:01:05 -07:00
parallel-checkout.h
parse-options-cb.c Merge branch 'ps/use-the-repository' 2024-07-02 09:59:00 -07:00
parse-options.c parse-options: free previous value of `OPTION_FILENAME` 2024-09-27 08:25:35 -07:00
parse-options.h
parse.c
parse.h
patch-delta.c
patch-ids.c
patch-ids.h
path.c environment: guard state depending on a repository 2024-09-12 10:15:42 -07:00
path.h path: hide functions using `the_repository` by default 2024-08-13 10:01:01 -07:00
pathspec.c environment: make `get_git_work_tree()` accept a repository 2024-09-12 10:15:40 -07:00
pathspec.h Merge branch 'as/pathspec-h-typofix' 2024-07-12 08:41:57 -07:00
pkt-line.c
pkt-line.h
preload-index.c environment: guard state depending on a repository 2024-09-12 10:15:42 -07:00
preload-index.h
pretty.c Merge branch 'ak/typofix-2.46-maint' 2024-09-25 10:37:12 -07:00
pretty.h
prio-queue.c
prio-queue.h
progress.c global: introduce `USE_THE_REPOSITORY_VARIABLE` macro 2024-06-14 10:26:33 -07:00
progress.h
promisor-remote.c promisor-remote: fix leaking partial clone filter 2024-09-27 08:25:36 -07:00
promisor-remote.h
prompt.c environment: guard state depending on a repository 2024-09-12 10:15:42 -07:00
prompt.h
protocol-caps.c protocol-caps: use hash algorithm from passed-in repository 2024-06-14 10:26:34 -07:00
protocol-caps.h
protocol.c global: prepare for hiding away repo-less config functions 2024-08-13 10:01:05 -07:00
protocol.h
prune-packed.c environment: make `get_object_directory()` accept a repository 2024-09-12 10:15:39 -07:00
prune-packed.h
pseudo-merge.c Merge branch 'jk/drop-unused-parameters' 2024-08-26 11:32:22 -07:00
pseudo-merge.h pack-bitmap: drop unused parameters from select_pseudo_merges() 2024-08-17 09:44:41 -07:00
quote.c
quote.h
range-diff.c userdiff: fix leaking memory for configured diff drivers 2024-08-14 10:08:01 -07:00
range-diff.h
reachable.c refs: add referent to each_ref_fn 2024-08-09 08:47:34 -07:00
reachable.h
read-cache-ll.h read-cache-ll: fix a typo 2024-09-19 13:46:00 -07:00
read-cache.c Merge branch 'ds/read-cache-mempool-leakfix' 2024-10-04 10:14:07 -07:00
read-cache.h
rebase-interactive.c Merge branch 'ps/use-the-repository' 2024-07-02 09:59:00 -07:00
rebase-interactive.h
rebase.c rebase: fix a typo 2024-09-19 13:46:01 -07:00
rebase.h
ref-filter.c Merge branch 'ak/refs-symref-referent-typofix' 2024-09-25 10:37:12 -07:00
ref-filter.h ref-filter: add ref_format_clear() function 2024-09-09 16:26:11 -07:00
reflog-walk.c global: introduce `USE_THE_REPOSITORY_VARIABLE` macro 2024-06-14 10:26:33 -07:00
reflog-walk.h
reflog.c Merge branch 'jc/reflog-expire-lookup-commit-fix' into maint-2.46 2024-08-26 11:10:21 -07:00
reflog.h
refs.c Merge branch 'ps/reftable-exclude' 2024-09-25 10:37:11 -07:00
refs.h Merge branch 'ak/typofix-2.46-maint' 2024-09-25 10:37:12 -07:00
refspec.c fetch: free "raw" string when shrinking refspec 2024-09-25 10:24:54 -07:00
refspec.h fetch: free "raw" string when shrinking refspec 2024-09-25 10:24:54 -07:00
remote-curl.c remote-curl: free HEAD ref with free_one_ref() 2024-09-25 10:24:56 -07:00
remote.c send-pack: free cas options before exit 2024-09-25 10:24:53 -07:00
remote.h send-pack: free cas options before exit 2024-09-25 10:24:53 -07:00
replace-object.c refs: add referent to each_ref_fn 2024-08-09 08:47:34 -07:00
replace-object.h
repo-settings.c environment: stop storing "core.warnAmbiguousRefs" globally 2024-09-12 10:15:44 -07:00
repo-settings.h environment: stop storing "core.warnAmbiguousRefs" globally 2024-09-12 10:15:44 -07:00
repository.c Merge branch 'ps/environ-wo-the-repository' 2024-09-23 10:35:05 -07:00
repository.h repo-settings: split out declarations into a standalone header 2024-09-12 10:15:42 -07:00
rerere.c Merge branch 'ps/config-wo-the-repository' 2024-08-23 09:02:34 -07:00
rerere.h
reset.c hooks: remove implicit dependency on `the_repository` 2024-08-13 10:01:01 -07:00
reset.h hash-ll: merge with "hash.h" 2024-06-14 10:26:33 -07:00
resolve-undo.c global: introduce `USE_THE_REPOSITORY_VARIABLE` macro 2024-06-14 10:26:33 -07:00
resolve-undo.h hash-ll: merge with "hash.h" 2024-06-14 10:26:33 -07:00
revision.c revision: fix leaking parents when simplifying commits 2024-09-27 08:25:37 -07:00
revision.h revision: fix a typo 2024-09-19 13:46:12 -07:00
run-command.c run-command: fix detaching when running auto maintenance 2024-08-16 09:46:26 -07:00
run-command.h run-command: fix a typo 2024-09-19 13:46:12 -07:00
sane-ctype.h
scalar.c Merge branch 'ds/background-maintenance-with-credential' 2024-09-30 16:16:16 -07:00
send-pack.c Merge branch 'ps/leakfixes-part-6' 2024-09-20 11:16:30 -07:00
send-pack.h
sequencer.c Merge branch 'mt/rebase-x-quiet' 2024-08-28 10:31:26 -07:00
sequencer.h Merge branch 'pw/rebase-i-error-message' into maint-2.45 2024-07-02 09:27:56 -07:00
serve.c drop trailing newline from warning/error/die messages 2024-09-05 09:07:12 -07:00
serve.h
server-info.c environment: make `get_object_directory()` accept a repository 2024-09-12 10:15:39 -07:00
server-info.h
setup.c Merge branch 'ak/typofix-2.46-maint' 2024-09-25 10:37:12 -07:00
setup.h environment: move `set_git_dir()` and related into setup layer 2024-09-12 10:15:41 -07:00
sh-i18n--envsubst.c
sha1dc_git.c
sha1dc_git.h sha1: do not redefine `platform_SHA_CTX` and friends 2024-09-27 11:27:47 -07:00
shallow.c shallow: fix leak when unregistering last shallow root 2024-09-25 10:24:52 -07:00
shallow.h
shared.mak
shell.c
shortlog.h
sideband.c Merge branch 'ak/typofix-2.46-maint' 2024-09-25 10:37:12 -07:00
sideband.h
sigchain.c
sigchain.h
simple-ipc.h
sparse-index.c Merge branch 'ds/sparse-checkout-expansion-advice' 2024-10-02 07:46:25 -07:00
sparse-index.h sparse-checkout: disable advice in 'disable' 2024-09-23 13:19:01 -07:00
split-index.c global: introduce `USE_THE_REPOSITORY_VARIABLE` macro 2024-06-14 10:26:33 -07:00
split-index.h hash-ll: merge with "hash.h" 2024-06-14 10:26:33 -07:00
stable-qsort.c
statinfo.c environment: guard state depending on a repository 2024-09-12 10:15:42 -07:00
statinfo.h
strbuf.c Merge branch 'gt/t-hash-unit-test' 2024-06-12 13:37:15 -07:00
strbuf.h
streaming.c global: introduce `USE_THE_REPOSITORY_VARIABLE` macro 2024-06-14 10:26:33 -07:00
streaming.h
string-list.c
string-list.h
strmap.c
strmap.h
strvec.c strvec: declare the `strvec_push_nodup()` function globally 2024-07-13 16:23:36 -07:00
strvec.h strvec: declare the `strvec_push_nodup()` function globally 2024-07-13 16:23:36 -07:00
sub-process.c
sub-process.h
submodule-config.c submodule: fix leaking update strategy 2024-09-27 08:25:34 -07:00
submodule-config.h
submodule.c Merge branch 'ps/leakfixes-part-7' 2024-10-02 07:46:26 -07:00
submodule.h submodule: fix leaking update strategy 2024-09-27 08:25:34 -07:00
symlinks.c
symlinks.h
tag.c global: introduce `USE_THE_REPOSITORY_VARIABLE` macro 2024-06-14 10:26:33 -07:00
tag.h
tar.h
tempfile.c
tempfile.h
thread-utils.c
thread-utils.h
tmp-objdir.c Merge branch 'tb/weak-sha1-for-tail-sum' 2024-10-02 07:46:27 -07:00
tmp-objdir.h
trace.c environment: make `get_git_work_tree()` accept a repository 2024-09-12 10:15:40 -07:00
trace.h
trace2.c
trace2.h refs/reftable: wire up support for exclude patterns 2024-09-16 13:57:19 -07:00
trailer.c global: prepare for hiding away repo-less config functions 2024-08-13 10:01:05 -07:00
trailer.h
transport-helper.c transport-helper: fix leak of dummy refs_list 2024-09-25 10:24:54 -07:00
transport-internal.h
transport.c fetch-pack: fix leaking sought refs 2024-09-25 10:24:52 -07:00
transport.h
tree-diff.c environment: guard state depending on a repository 2024-09-12 10:15:42 -07:00
tree-walk.c global: introduce `USE_THE_REPOSITORY_VARIABLE` macro 2024-06-14 10:26:33 -07:00
tree-walk.h hash-ll: merge with "hash.h" 2024-06-14 10:26:33 -07:00
tree.c global: introduce `USE_THE_REPOSITORY_VARIABLE` macro 2024-06-14 10:26:33 -07:00
tree.h
unicode-width.h unicode: update the width tables to Unicode 16 2024-09-12 14:20:44 -07:00
unimplemented.sh
unix-socket.c
unix-socket.h
unix-stream-server.c
unix-stream-server.h
unpack-trees.c unpack-trees: clear index when not propagating it 2024-08-14 10:08:00 -07:00
unpack-trees.h
upload-pack.c Merge branch 'ak/typofix-2.46-maint' 2024-09-25 10:37:12 -07:00
upload-pack.h
url.c
url.h
urlmatch.c
urlmatch.h
usage.c
userdiff.c environment: guard state depending on a repository 2024-09-12 10:15:42 -07:00
userdiff.h userdiff: fix leaking memory for configured diff drivers 2024-08-14 10:08:01 -07:00
utf8.c
utf8.h utf8.h: squelch unused-parameter warnings with NO_ICONV 2024-10-02 15:52:48 -07:00
varint.c
varint.h
version.c
version.h
versioncmp.c global: prepare for hiding away repo-less config functions 2024-08-13 10:01:05 -07:00
versioncmp.h
walker.c refs: add referent to each_ref_fn 2024-08-09 08:47:34 -07:00
walker.h
wildmatch.c
wildmatch.h
worktree.c environment: make `get_git_common_dir()` accept a repository 2024-09-12 10:15:39 -07:00
worktree.h Merge branch 'jc/worktree-git-path' 2024-06-24 16:39:15 -07:00
wrap-for-bin.sh
wrapper.c
wrapper.h wrapper: introduce `log2u()` 2024-09-04 08:03:24 -07:00
write-or-die.c
write-or-die.h
ws.c
ws.h
wt-status.c Merge branch 'ps/environ-wo-the-repository' 2024-09-23 10:35:05 -07:00
wt-status.h
xdiff-interface.c global: introduce `USE_THE_REPOSITORY_VARIABLE` macro 2024-06-14 10:26:33 -07:00
xdiff-interface.h hash-ll: merge with "hash.h" 2024-06-14 10:26:33 -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