Go to file
Taylor Blau 0c5a62f14b midx-write.c: do not read existing MIDX with `packs_to_include`
Commit d6a8c58675 (midx-write.c: support reading an existing MIDX with
`packs_to_include`, 2024-05-29) changed the MIDX generation machinery to
support reading from an existing MIDX when writing a new one.

Unfortunately, the rest of the MIDX generation machinery is not prepared
to deal with such a change. For instance, the function responsible for
adding to the object ID fanout table from a MIDX source
(midx_fanout_add_midx_fanout()) will gladly add objects from an existing
MIDX for some fanout level regardless of whether or not those objects
came from packs that are to be included in the subsequent MIDX write.

This results in broken pseudo-pack object order (leading to incorrect
object traversal results) and segmentation faults, like so (generated by
running the added test prior to the changes in midx-write.c):

    #0  0x000055ee31393f47 in midx_pack_order (ctx=0x7ffdde205c70) at midx-write.c:590
    #1  0x000055ee31395a69 in write_midx_internal (object_dir=0x55ee32570440 ".git/objects",
        packs_to_include=0x7ffdde205e20, packs_to_drop=0x0, preferred_pack_name=0x0,
        refs_snapshot=0x0, flags=15) at midx-write.c:1171
    #2  0x000055ee31395f38 in write_midx_file_only (object_dir=0x55ee32570440 ".git/objects",
        packs_to_include=0x7ffdde205e20, preferred_pack_name=0x0, refs_snapshot=0x0, flags=15)
        at midx-write.c:1274
    [...]

In stack frame #0, the code on midx-write.c:590 is using the new pack ID
corresponding to some object which was added from the existing MIDX.
Importantly, the pack from which that object was selected in the
existing MIDX does not appear in the new MIDX as it was excluded via
`--stdin-packs`.

In this instance, the pack in question had pack ID "1" in the existing
MIDX, but since it was excluded from the new MIDX, we never filled in
that entry in the pack_perm table, resulting in:

    (gdb) p *ctx->pack_perm@2
    $1 = {0, 1515870810}

Which is what causes the segfault above when we try and read:

    struct pack_info *pack = &ctx->info[ctx->pack_perm[i]];
    if (pack->bitmap_pos == BITMAP_POS_UNKNOWN)
        pack->bitmap_pos = 0;

Fundamentally, we should be able to read information from an existing
MIDX when generating a new one. But in practice the midx-write.c code
assumes that we won't run into issues like the above with incongruent
pack IDs, and often makes those assumptions in extremely subtle and
fragile ways.

Instead, let's avoid reading from an existing MIDX altogether, and stick
with the pre-d6a8c58675 implementation. Harden against any regressions
in this area by adding a test which demonstrates these issues.

Signed-off-by: Taylor Blau <me@ttaylorr.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2024-06-11 16:08:28 -07:00
.github Merge branch 'fixes/2.45.1/2.44' into jc/fix-2.45.1-and-friends-for-maint 2024-05-24 16:59:12 -07:00
Documentation The eleventh batch 2024-06-06 12:49:25 -07:00
block-sha1
builtin Merge branch 'rs/difftool-env-simplify' 2024-06-06 12:49:24 -07:00
ci Merge branch 'ps/ci-python-2-deprecation' into maint-2.45 2024-05-31 15:28:19 -07:00
compat Merge branch 'ma/win32-unix-domain-socket' into maint-2.45 2024-05-31 15:28:21 -07:00
contrib Merge branch 'kn/osxkeychain-skip-idempotent-store' 2024-05-28 11:17:11 -07:00
ewah
git-gui
gitk-git
gitweb
mergetools Switch grep from non-portable BRE to portable ERE 2024-05-17 12:13:18 -07:00
negotiator cocci: apply rules to rewrite callers of "refs" interfaces 2024-05-07 10:06:59 -07:00
oss-fuzz oss-fuzz/commit-graph: set up hash algorithm 2024-05-06 22:50:50 -07:00
perl
po Merge branch 'master' of github.com:alshopov/git-po 2024-04-29 14:50:23 +08:00
refs Merge branch 'ps/refs-without-the-repository-updates' 2024-05-30 14:15:13 -07:00
reftable Merge branch 'ps/reftable-reusable-iterator' 2024-05-30 14:15:12 -07:00
sha1
sha1collisiondetection@855827c583
sha1dc
sha256
t midx-write.c: do not read existing MIDX with `packs_to_include` 2024-06-11 16:08:28 -07:00
templates
trace2
xdiff
.cirrus.yml
.clang-format
.editorconfig
.gitattributes
.gitignore
.gitlab-ci.yml Merge branch 'jt/port-ci-whitespace-check-to-gitlab' 2024-05-15 09:52:54 -07:00
.gitmodules
.mailmap
.tsan-suppressions
CODE_OF_CONDUCT.md
COPYING
GIT-VERSION-GEN Git 2.45.2 2024-05-30 17:18:43 -07:00
INSTALL
LGPL-2.1
Makefile Merge branch 'ps/leakfixes' 2024-06-06 12:49:23 -07:00
README.md
RelNotes Git 2.45.2 2024-05-30 17:18:43 -07:00
SECURITY.md
abspath.c
abspath.h
aclocal.m4
add-interactive.c cocci: apply rules to rewrite callers of "refs" interfaces 2024-05-07 10:06:59 -07:00
add-interactive.h
add-patch.c add-patch: enforce only one-letter response to prompts 2024-05-22 14:46:31 -07:00
advice.c advice: add --no-advice global option 2024-05-03 10:36:59 -07:00
advice.h
alias.c config: plug various memory leaks 2024-05-27 11:20:00 -07:00
alias.h
alloc.c
alloc.h
apply.c Merge branch 'rj/add-i-leak-fix' 2024-04-25 10:34:24 -07:00
apply.h
archive-tar.c
archive-zip.c
archive.c
archive.h
attr.c Merge branch 'ps/leakfixes' 2024-06-06 12:49:23 -07:00
attr.h config: clarify memory ownership in `git_config_string()` 2024-05-27 11:20:00 -07:00
banned.h
base85.c
base85.h
bisect.c cocci: apply rules to rewrite callers of "refs" interfaces 2024-05-07 10:06:59 -07:00
bisect.h
blame.c cocci: apply rules to rewrite callers of "refs" interfaces 2024-05-07 10:06:59 -07:00
blame.h
blob.c
blob.h
bloom.c
bloom.h
branch.c Merge branch 'kn/ref-transaction-symref' 2024-05-20 11:20:04 -07:00
branch.h
builtin.h
bulk-checkin.c
bulk-checkin.h
bundle-uri.c cocci: apply rules to rewrite callers of "refs" interfaces 2024-05-07 10:06:59 -07:00
bundle-uri.h
bundle.c cocci: apply rules to rewrite callers of "refs" interfaces 2024-05-07 10:06:59 -07:00
bundle.h
cache-tree.c
cache-tree.h
cbtree.c
cbtree.h
chdir-notify.c
chdir-notify.h
check-builtins.sh
checkout.c checkout: clarify memory ownership in `unique_tracking_name()` 2024-05-27 11:19:58 -07:00
checkout.h checkout: clarify memory ownership in `unique_tracking_name()` 2024-05-27 11:19:58 -07:00
chunk-format.c
chunk-format.h
color.c color: add support for 12-bit RGB colors 2024-05-02 09:30:38 -07:00
color.h color: add support for 12-bit RGB colors 2024-05-02 09:30:38 -07:00
column.c
column.h
combine-diff.c refs: refactor `resolve_gitlink_ref()` to accept a repository 2024-05-17 10:33:38 -07:00
command-list.txt
commit-graph.c refs: pass repo when peeling objects 2024-05-17 10:33:39 -07:00
commit-graph.h
commit-reach.c commit-reach: fix memory leak in `ahead_behind()` 2024-05-27 11:20:01 -07:00
commit-reach.h
commit-slab-decl.h
commit-slab-impl.h
commit-slab.h
commit.c cocci: apply rules to rewrite callers of "refs" interfaces 2024-05-07 10:06:59 -07:00
commit.h
common-main.c
config.c Merge branch 'ps/leakfixes' 2024-06-06 12:49:23 -07:00
config.h Merge branch 'ps/leakfixes' 2024-06-06 12:49:23 -07:00
config.mak.dev
config.mak.in
config.mak.uname Merge branch 'js/build-fuzz-more-often' 2024-04-30 14:49:44 -07:00
configure.ac
connect.c
connect.h
connected.c
connected.h
convert.c config: clarify memory ownership in `git_config_string()` 2024-05-27 11:20:00 -07:00
convert.h convert: refactor code to clarify ownership of check_roundtrip_encoding 2024-05-27 11:19:59 -07:00
copy.c Merge branch 'fixes/2.45.1/2.41' into fixes/2.45.1/2.42 2024-05-24 16:57:43 -07:00
copy.h Merge branch 'fixes/2.45.1/2.40' into fixes/2.45.1/2.41 2024-05-24 16:57:02 -07:00
credential.c
credential.h
csum-file.c
csum-file.h
ctype.c
daemon.c
date.c
date.h
decorate.c
decorate.h
delta-islands.c config: clarify memory ownership in `git_config_string()` 2024-05-27 11:20:00 -07:00
delta-islands.h
delta.h
detect-compiler
diagnose.c
diagnose.h
diff-delta.c
diff-lib.c refs: refactor `resolve_gitlink_ref()` to accept a repository 2024-05-17 10:33:38 -07:00
diff-merges.c
diff-merges.h
diff-no-index.c
diff.c config: clarify memory ownership in `git_config_string()` 2024-05-27 11:20:00 -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.h
dir.c refs: refactor `resolve_gitlink_ref()` to accept a repository 2024-05-17 10:33:38 -07:00
dir.h Sync with 2.44.1 2024-04-29 20:42:30 +02:00
editor.c
editor.h
entry.c
entry.h
environment.c config: clarify memory ownership in `git_config_string()` 2024-05-27 11:20:00 -07:00
environment.h config: clarify memory ownership in `git_config_string()` 2024-05-27 11:20:00 -07:00
exec-cmd.c
exec-cmd.h
fetch-negotiator.c
fetch-negotiator.h
fetch-pack.c Merge branch 'ps/leakfixes' 2024-06-06 12:49:23 -07:00
fetch-pack.h
fmt-merge-msg.c cocci: apply rules to rewrite callers of "refs" interfaces 2024-05-07 10:06:59 -07:00
fmt-merge-msg.h
fsck.c Merge branch 'ps/leakfixes' 2024-06-06 12:49:23 -07:00
fsck.h Merge branch 'fixes/2.45.1/2.42' into fixes/2.45.1/2.43 2024-05-24 16:58:11 -07:00
fsmonitor--daemon.h
fsmonitor-ipc.c
fsmonitor-ipc.h
fsmonitor-ll.h
fsmonitor-path-utils.h
fsmonitor-settings.c config: clarify memory ownership in `git_config_pathname()` 2024-05-27 11:19:59 -07:00
fsmonitor-settings.h
fsmonitor.c
fsmonitor.h
generate-cmdlist.sh
generate-configlist.sh
generate-hooklist.sh
gettext.c
gettext.h
git-archimport.perl
git-compat-util.h Merge branch 'rs/no-openssl-compilation-fix-on-macos' 2024-04-23 11:52:38 -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-merge-octopus.sh
git-merge-one-file.sh
git-merge-resolve.sh
git-mergetool--lib.sh
git-mergetool.sh
git-p4.py git-p4: show Perforce error to the user 2024-05-08 15:44:14 -07:00
git-quiltimport.sh
git-request-pull.sh
git-send-email.perl Merge branch 'fixes/2.45.1/2.40' into fixes/2.45.1/2.41 2024-05-24 16:57:02 -07:00
git-sh-i18n.sh
git-sh-setup.sh
git-submodule.sh
git-svn.perl
git-web--browse.sh
git-zlib.c
git-zlib.h
git.c advice: add --no-advice global option 2024-05-03 10:36:59 -07:00
git.rc
gpg-interface.c config: clarify memory ownership in `git_config_string()` 2024-05-27 11:20:00 -07:00
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 cocci: apply rules to rewrite callers of "refs" interfaces 2024-05-07 10:06:59 -07:00
help.h
hex-ll.c
hex-ll.h
hex.c
hex.h
hook.c Merge branch 'fixes/2.45.1/2.41' into fixes/2.45.1/2.42 2024-05-24 16:57:43 -07:00
hook.h
http-backend.c cocci: apply rules to rewrite callers of "refs" interfaces 2024-05-07 10:06:59 -07:00
http-fetch.c
http-push.c
http-walker.c
http.c config: clarify memory ownership in `git_config_string()` 2024-05-27 11:20:00 -07:00
http.h
ident.c
ident.h
imap-send.c config: clarify memory ownership in `git_config_string()` 2024-05-27 11:20:00 -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.h
linear-assignment.c
linear-assignment.h
list-objects-filter-options.c
list-objects-filter-options.h
list-objects-filter.c
list-objects-filter.h
list-objects.c
list-objects.h
list.h
lockfile.c
lockfile.h
log-tree.c cocci: apply rules to rewrite callers of "refs" interfaces 2024-05-07 10:06:59 -07:00
log-tree.h
loose.c
loose.h
ls-refs.c refs: pass repo when peeling objects 2024-05-17 10:33:39 -07:00
ls-refs.h
mailinfo.c
mailinfo.h
mailmap.c config: clarify memory ownership in `git_config_string()` 2024-05-27 11:20:00 -07:00
mailmap.h config: clarify memory ownership in `git_config_string()` 2024-05-27 11:20:00 -07:00
match-trees.c
match-trees.h
mem-pool.c don't report vsnprintf(3) error as bug 2024-04-21 12:27:07 -07:00
mem-pool.h
merge-blobs.c
merge-blobs.h
merge-ll.c config: clarify memory ownership in `git_config_string()` 2024-05-27 11:20:00 -07:00
merge-ll.h
merge-ort-wrappers.c
merge-ort-wrappers.h
merge-ort.c
merge-ort.h
merge-recursive.c
merge-recursive.h
merge.c
merge.h
mergesort.h
midx-write.c midx-write.c: do not read existing MIDX with `packs_to_include` 2024-06-11 16:08:28 -07:00
midx.c midx: replace `get_midx_rev_filename()` with a generic helper 2024-05-30 13:43:52 -07:00
midx.h midx: replace `get_midx_rev_filename()` with a generic helper 2024-05-30 13:43:52 -07:00
name-hash.c
name-hash.h
notes-cache.c cocci: apply rules to rewrite callers of "refs" interfaces 2024-05-07 10:06:59 -07:00
notes-cache.h
notes-merge.c cocci: apply rules to rewrite callers of "refs" interfaces 2024-05-07 10:06:59 -07:00
notes-merge.h
notes-utils.c cocci: apply rules to rewrite callers of "refs" interfaces 2024-05-07 10:06:59 -07:00
notes-utils.h
notes.c cocci: apply rules to rewrite callers of "refs" interfaces 2024-05-07 10:06:59 -07:00
notes.h
object-file-convert.c
object-file-convert.h
object-file.c refs: refactor `resolve_gitlink_ref()` to accept a repository 2024-05-17 10:33:38 -07:00
object-file.h
object-name.c
object-name.h
object-store-ll.h
object-store.h
object.c refs: pass repo when peeling objects 2024-05-17 10:33:39 -07:00
object.h Merge branch 'ps/refs-without-the-repository-updates' 2024-05-30 14:15:13 -07:00
oid-array.c
oid-array.h
oidmap.c
oidmap.h
oidset.c
oidset.h
oidtree.c
oidtree.h
pack-bitmap-write.c pack-bitmap: introduce `bitmap_writer_free()` 2024-05-15 06:53:46 -07:00
pack-bitmap.c pack-bitmap.c: reimplement `midx_bitmap_filename()` with helper 2024-05-30 13:43:52 -07:00
pack-bitmap.h pack-bitmap: introduce `bitmap_writer_free()` 2024-05-15 06:53:46 -07:00
pack-check.c
pack-mtimes.c
pack-mtimes.h
pack-objects.c
pack-objects.h
pack-revindex.c midx: replace `get_midx_rev_filename()` with a generic helper 2024-05-30 13:43:52 -07:00
pack-revindex.h
pack-write.c
pack.h
packfile.c
packfile.h
pager.c config: clarify memory ownership in `git_config_string()` 2024-05-27 11:20:00 -07:00
pager.h
parallel-checkout.c
parallel-checkout.h
parse-options-cb.c parse-options-cb: only abbreviate hashes when hash algo is known 2024-05-06 22:50:48 -07:00
parse-options.c
parse-options.h
parse.c
parse.h
patch-delta.c
patch-ids.c
patch-ids.h
path.c Merge branch 'ps/undecided-is-not-necessarily-sha1' 2024-05-30 14:15:11 -07:00
path.h path: move `validate_headref()` to its only user 2024-05-06 22:50:48 -07:00
pathspec.c
pathspec.h
pkt-line.c
pkt-line.h
preload-index.c
preload-index.h
pretty.c config: clarify memory ownership in `git_config_string()` 2024-05-27 11:20:00 -07:00
pretty.h
prio-queue.c
prio-queue.h
progress.c
progress.h
promisor-remote.c Merge branch 'th/quiet-lazy-fetch-from-promisor' 2024-06-06 12:49:24 -07:00
promisor-remote.h config: clarify memory ownership in `git_config_string()` 2024-05-27 11:20:00 -07:00
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 format-patch: run range-diff with larger creation-factor 2024-05-06 11:57:22 -07:00
reachable.c cocci: apply rules to rewrite callers of "refs" interfaces 2024-05-07 10:06:59 -07:00
reachable.h
read-cache-ll.h
read-cache.c refs: refactor `resolve_gitlink_ref()` to accept a repository 2024-05-17 10:33:38 -07:00
read-cache.h
rebase-interactive.c
rebase-interactive.h
rebase.c
rebase.h
ref-filter.c Merge branch 'ps/refs-without-the-repository-updates' 2024-05-30 14:15:13 -07:00
ref-filter.h ref-filter: properly distinuish pseudo and root refs 2024-05-15 07:30:52 -07:00
reflog-walk.c refs: remove `dwim_log()` 2024-05-17 10:33:39 -07:00
reflog-walk.h
reflog.c refs: remove `dwim_log()` 2024-05-17 10:33:39 -07:00
reflog.h
refs.c Merge branch 'ps/refs-without-the-repository-updates' 2024-05-30 14:15:13 -07:00
refs.h Merge branch 'ps/refs-without-the-repository-updates' 2024-05-30 14:15:13 -07:00
refspec.c
refspec.h
remote-curl.c Merge branch 'ps/undecided-is-not-necessarily-sha1' 2024-05-30 14:15:11 -07:00
remote.c Merge branch 'ps/leakfixes' 2024-06-06 12:49:23 -07:00
remote.h config: clarify memory ownership in `git_config_string()` 2024-05-27 11:20:00 -07:00
replace-object.c refs: convert iteration over replace refs to accept ref store 2024-05-17 10:33:38 -07:00
replace-object.h
repo-settings.c
repository.c Merge branch 'jc/undecided-is-not-necessarily-sha1-fix' 2024-05-30 14:15:14 -07:00
repository.h refs: retrieve worktree ref stores via associated repository 2024-05-17 10:33:38 -07:00
rerere.c Merge branch 'mr/rerere-crash-fix' 2024-04-23 11:52:41 -07:00
rerere.h
reset.c Merge branch 'kn/ref-transaction-symref' 2024-05-20 11:20:04 -07:00
reset.h
resolve-undo.c
resolve-undo.h
revision.c cocci: apply rules to rewrite callers of "refs" interfaces 2024-05-07 10:06:59 -07:00
revision.h
run-command.c
run-command.h
sane-ctype.h
scalar.c scalar: make enlistment delete to work on all POSIX platforms 2024-05-17 12:16:25 -07:00
send-pack.c
send-pack.h
sequencer.c Merge branch 'ps/leakfixes' 2024-06-06 12:49:23 -07:00
sequencer.h Merge branch 'pw/rebase-m-signoff-fix' 2024-04-30 14:49:41 -07:00
serve.c
serve.h
server-info.c cocci: apply rules to rewrite callers of "refs" interfaces 2024-05-07 10:06:59 -07:00
server-info.h
setup.c Merge branch 'ps/leakfixes' 2024-06-06 12:49:23 -07:00
setup.h Sync with 2.44.1 2024-04-29 20:42:30 +02:00
sh-i18n--envsubst.c
sha1dc_git.c
sha1dc_git.h
shallow.c cocci: apply rules to rewrite callers of "refs" interfaces 2024-05-07 10:06:59 -07:00
shallow.h
shared.mak
shell.c
shortlog.h
sideband.c
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: fix leak when `appendwholeline()` fails with EOF 2024-05-27 11:19:58 -07:00
strbuf.h
streaming.c
streaming.h
string-list.c
string-list.h
strmap.c
strmap.h
strvec.c strvec: add functions to replace and remove strings 2024-05-27 11:20:02 -07:00
strvec.h strvec: add functions to replace and remove strings 2024-05-27 11:20:02 -07:00
sub-process.c
sub-process.h
submodule-config.c submodule: fix leaking memory for submodule entries 2024-05-27 11:20:01 -07:00
submodule-config.h
submodule.c refs: pass repo when retrieving submodule ref store 2024-05-17 10:33:37 -07:00
submodule.h
symlinks.c
symlinks.h
tag.c refs: pass repo when peeling objects 2024-05-17 10:33:39 -07:00
tag.h refs: pass repo when peeling objects 2024-05-17 10:33:39 -07:00
tar.h
tempfile.c
tempfile.h
thread-utils.c
thread-utils.h
tmp-objdir.c
tmp-objdir.h
trace.c
trace.h
trace2.c
trace2.h
trailer.c Merge branch 'la/hide-trailer-info' 2024-05-23 11:04:27 -07:00
trailer.h Merge branch 'la/hide-trailer-info' 2024-05-23 11:04:27 -07:00
transport-helper.c transport-helper: fix leaking helper name 2024-05-27 11:19:57 -07:00
transport-internal.h
transport.c transport-helper: fix leaking helper name 2024-05-27 11:19:57 -07:00
transport.h
tree-diff.c
tree-walk.c
tree-walk.h
tree.c
tree.h
unicode-width.h
unimplemented.sh
unix-socket.c
unix-socket.h
unix-stream-server.c
unix-stream-server.h
unpack-trees.c refs: refactor `resolve_gitlink_ref()` to accept a repository 2024-05-17 10:33:38 -07:00
unpack-trees.h
upload-pack.c Merge branch 'ps/leakfixes' 2024-06-06 12:49:23 -07:00
upload-pack.h
url.c
url.h
urlmatch.c
urlmatch.h
usage.c
userdiff.c
userdiff.h config: clarify memory ownership in `git_config_string()` 2024-05-27 11:20:00 -07:00
utf8.c
utf8.h
varint.c
varint.h
version.c
version.h
versioncmp.c
versioncmp.h
walker.c Merge branch 'kn/ref-transaction-symref' 2024-05-20 11:20:04 -07:00
walker.h
wildmatch.c
wildmatch.h
worktree.c refs: retrieve worktree ref stores via associated repository 2024-05-17 10:33:38 -07:00
worktree.h refs: retrieve worktree ref stores via associated repository 2024-05-17 10:33:38 -07:00
wrap-for-bin.sh
wrapper.c don't report vsnprintf(3) error as bug 2024-04-21 12:27:07 -07:00
wrapper.h
write-or-die.c
write-or-die.h
ws.c
ws.h
wt-status.c cocci: apply rules to rewrite callers of "refs" interfaces 2024-05-07 10:06:59 -07:00
wt-status.h
xdiff-interface.c
xdiff-interface.h

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