Go to file

Jeff King d70f554cdf commit-graph: retain commit slab when closing NULL commit_graph This fixes a regression introduced in `ac6d45d11f` (commit-graph: move slab-clearing to close_commit_graph(), 2023-10-03), in which running: git -c fetch.writeCommitGraph=true fetch --recurse-submodules multiple times in a freshly cloned repository causes a segfault. What happens in the second (and subsequent) runs is this: 1. We make a "struct commit" for any ref tips which we're storing (even if we already have them, they still go into FETCH_HEAD). Because the first run will have created a commit graph, we'll find those commits in the graph. The commit struct is therefore created with a NULL "maybe_tree" entry, because we can load its oid from the graph later. But to do that we need to remember that we got the commit from the graph, which is recorded in a global commit_graph_data_slab object. 2. Because we're using --recurse-submodules, we'll try to fetch each of the possible submodules. That implies creating a separate "struct repository" in-process for each submodule, which will require a later call to repo_clear(). The call to repo_clear() calls raw_object_store_clear(), which in turn calls close_object_store(), which in turn calls close_commit_graph(). And the latter frees the commit graph data slab. 3. Later, when trying to write out a new commit graph, we'll ask for their tree oid via get_commit_tree_oid(), which will see that the object is parsed but with a NULL maybe_tree field. We'd then usually pull it from the graph file, but because the slab was cleared, we don't realize that we can do so! We end up returning NULL and segfaulting. (It seems questionable that we'd write a graph entry for such a commit anyway, since we know we already have one. I didn't double-check, but that may simply be another side effect of having cleared the slab). The bug is in step (2) above. We should not be clearing the slab when cleaning up the submodule repository structs. Prior to `ac6d45d11f`, we did not do so because it was done inside a helper function that returned early when it saw NULL. So the behavior change from that commit is that we'll now _always_ clear the slab via repo_clear(), even if the repository being closed did not have a commit graph (and thus would have a NULL commit_graph struct). The most immediate fix is to add in a NULL check in close_commit_graph(), making it a true noop when passed in an object_store with a NULL commit_graph (it's OK to just return early, since the rest of its code is already a noop when passed NULL). That restores the pre-ac6d45d11f behavior. And that's what this patch does, along with a test that exercises it (we already have a test that uses submodules along with fetch.writeCommitGraph, but the bug only triggers when there is a subsequent fetch and when that fetch uses --recurse-submodules). So that fixes the regression in the least-risky way possible. I do think there's some fragility here that we might want to follow up on. We have a global commit_graph_data_slab that contains graph positions, and our global commit structs depend on the that slab remaining valid. But close_commit_graph() is just about closing _one_ object store's graph. So it's dangerous to call that function and clear the slab without also throwing away any "struct commit" we might have parsed that depends on it. Which at first glance seems like a bug we could already trigger. In the situation described here, there is no commit graph in the submodule repository, so our commit graph is NULL (in fact, in our test script there is no submodule repo at all, so we immediately return from repo_init() and call repo_clear() only to free up memory). But what would happen if there was one? Wouldn't we see a non-NULL commit_graph entry, and then clear the global slab anyway? The answer is "no", but for very bizarre reasons. Remember that repo_clear() calls raw_object_store_clear(), which then calls close_object_store() and thus close_commit_graph(). But before it does so, raw_object_store_clear() does something else: it frees the commit graph and sets it to NULL! So by this code path we'll _never_ see a non-NULL commit_graph struct, and thus never clear the slab. So it happens to work out. But it still seems questionable to me that we would clear a global slab (which might still be in use) when closing the commit graph. This clearing comes from `957ba814bf` (commit-graph: when closing the graph, also release the slab, 2021-09-08), and was fixing a case where we really did need it to be closed (and in that case we presumably call close_object_store() more directly). So I suspect there may still be a bug waiting to happen there, as any object loaded before the call to close_object_store() may be stranded with a bogus maybe_tree entry (and thus looking at it after the call might cause an error). But I'm not sure how to trigger it, nor what the fix should look like (you probably would need to "unparse" any objects pulled from the graph). And so this patch punts on that for now in favor of fixing the recent regression in the most direct way, which should not have any other fallouts. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>		2024-01-05 08:35:26 -08:00
.github	Merge branch 'jk/ci-retire-allow-ref'	2023-09-07 15:06:08 -07:00
Documentation	The fourteenth batch	2023-10-02 11:20:00 -07:00
block-sha1	…
builtin	commit-graph: clear oidset after finishing write	2023-10-03 14:28:24 -07:00
ci	Merge branch 'jk/ci-retire-allow-ref'	2023-09-07 15:06:08 -07:00
compat	Merge branch 'jk/fsmonitor-unused-parameter'	2023-09-29 09:04:14 -07:00
contrib	completion: loosen and document the requirement around completing alias	2023-09-20 11:41:41 -07:00
ewah	git-compat-util: move alloc macros to git-compat-util.h	2023-07-05 11:42:31 -07:00
git-gui	Merge git-gui into ml/git-gui-exec-path-fix	2023-09-18 10:52:30 -07:00
gitk-git	Merge gitk changes into js/gitk-fixes-from-gfw	2023-05-08 09:16:57 -07:00
gitweb	…
mergetools	…
negotiator	negotiator/noop: mark unused callback parameters	2023-08-29 17:56:25 -07:00
oss-fuzz	object-store-ll.h: split this header out of object-store.h	2023-06-21 13:39:54 -07:00
perl	…
po	Merge branch 'po-id' of github.com:bagasme/git-po	2023-08-21 07:05:38 +08:00
refs	Merge branch 'tb/refs-exclusion-and-packed-refs'	2023-07-21 13:47:26 -07:00
reftable	reftable: ensure git-compat-util.h is the first (indirect) include	2023-04-24 12:47:33 -07:00
sha1	avoid SHA-1 functions deprecated in OpenSSL 3+	2023-08-01 08:34:56 -07:00
sha1collisiondetection@855827c583	…
sha1dc	…
sha256	Merge branch 'ew/hash-with-openssl-evp'	2023-08-09 16:18:15 -07:00
t	commit-graph: retain commit slab when closing NULL commit_graph	2024-01-05 08:35:26 -08:00
templates	send-email: export patch counters in validate environment	2023-04-14 10:41:15 -07:00
trace2	trace2: mark unused config callback parameter	2023-08-29 17:56:25 -07:00
xdiff	…
.cirrus.yml	…
.clang-format	…
.editorconfig	…
.gitattributes	…
.gitignore	gitignore: ignore clangd .cache directory	2023-08-04 10:56:51 -07:00
.gitmodules	…
.mailmap	mailmap: change primary address for Glen Choo	2023-08-07 11:58:17 -07:00
.tsan-suppressions	…
CODE_OF_CONDUCT.md	…
COPYING	…
GIT-VERSION-GEN	Start the 2.43 cycle	2023-08-24 09:32:34 -07:00
INSTALL	Sync with 2.31.8	2023-04-17 21:15:49 +02:00
LGPL-2.1	…
Makefile	Merge branch 'jc/update-index-show-index-version'	2023-09-20 10:45:16 -07:00
README.md	…
RelNotes	Start the 2.43 cycle	2023-08-24 09:32:34 -07:00
SECURITY.md	…
abspath.c	abspath: move related functions to abspath	2023-06-12 13:49:35 -07:00
abspath.h	abspath: move related functions to abspath	2023-06-12 13:49:35 -07:00
aclocal.m4	…
add-interactive.c	Merge branch 'jk/unused-post-2.42'	2023-09-07 15:06:07 -07:00
add-interactive.h	…
add-patch.c	Merge branch 'cw/compat-util-header-cleanup'	2023-07-17 11:30:42 -07:00
advice.c	advice: handle "rebase" in error_resolve_conflict()	2023-08-07 13:21:00 -07:00
advice.h	worktree add: introduce "try --orphan" hint	2023-05-17 15:55:24 -07:00
alias.c	Merge branch 'cw/compat-util-header-cleanup'	2023-07-17 11:30:42 -07:00
alias.h	rebase -m: fix serialization of strategy options	2023-04-10 09:53:19 -07:00
alloc.c	hash-ll.h: split out of hash.h to remove dependency on repository.h	2023-04-24 12:47:32 -07:00
alloc.h	git-compat-util: move alloc macros to git-compat-util.h	2023-07-05 11:42:31 -07:00
apply.c	Merge branch 'cw/compat-util-header-cleanup'	2023-07-17 11:30:42 -07:00
apply.h	hash-ll.h: split out of hash.h to remove dependency on repository.h	2023-04-24 12:47:32 -07:00
archive-tar.c	Merge branch 'cw/compat-util-header-cleanup'	2023-07-17 11:30:42 -07:00
archive-zip.c	Merge branch 'gc/config-context'	2023-07-06 11:54:48 -07:00
archive.c	git-compat-util: move alloc macros to git-compat-util.h	2023-07-05 11:42:31 -07:00
archive.h	treewide: reduce includes of cache.h in other headers	2023-04-11 08:52:11 -07:00
attr.c	Merge branch 'sl/sparse-check-attr'	2023-08-29 13:51:43 -07:00
attr.h	attr: expose and rename accessor functions	2023-06-27 11:31:06 -07:00
banned.h	banned.h: mark `strtok()` and `strtok_r()` as banned	2023-04-27 08:51:11 -07:00
base85.c	base85.h: move declarations for base85.c functions from cache.h	2023-04-24 12:47:32 -07:00
base85.h	base85.h: move declarations for base85.c functions from cache.h	2023-04-24 12:47:32 -07:00
bisect.c	object-store-ll.h: split this header out of object-store.h	2023-06-21 13:39:54 -07:00
bisect.h	…
blame.c	blame: allow --contents to work with bare repo	2023-07-21 07:32:58 -07:00
blame.h	diff.h: remove unnecessary include of oidset.h	2023-06-21 13:39:53 -07:00
blob.c	…
blob.h	…
bloom.c	commit.h: reduce unnecessary includes	2023-04-24 12:47:33 -07:00
bloom.h	…
branch.c	branch: error message checking out a branch in use	2023-08-08 18:27:30 -07:00
branch.h	…
builtin.h	builtin.h: remove unneccessary includes	2023-06-21 13:39:54 -07:00
bulk-checkin.c	Merge branch 'ew/hash-with-openssl-evp'	2023-09-13 10:07:57 -07:00
bulk-checkin.h	…
bundle-uri.c	bundle-uri: mark unused parameters in callbacks	2023-08-29 17:56:26 -07:00
bundle-uri.h	…
bundle.c	Merge branch 'dk/bundle-i18n-more'	2023-07-25 12:05:24 -07:00
bundle.h	…
cache-tree.c	git-compat-util: move alloc macros to git-compat-util.h	2023-07-05 11:42:31 -07:00
cache-tree.h	…
cbtree.c	…
cbtree.h	…
chdir-notify.c	treewide: reduce includes of cache.h in other headers	2023-04-11 08:52:11 -07:00
chdir-notify.h	…
check-builtins.sh	…
checkout.c	hash-ll.h: split out of hash.h to remove dependency on repository.h	2023-04-24 12:47:32 -07:00
checkout.h	hash-ll.h: split out of hash.h to remove dependency on repository.h	2023-04-24 12:47:32 -07:00
chunk-format.c	git-compat-util: move alloc macros to git-compat-util.h	2023-07-05 11:42:31 -07:00
chunk-format.h	hash-ll.h: split out of hash.h to remove dependency on repository.h	2023-04-24 12:47:32 -07:00
color.c	config: inline git_color_default_config	2023-06-28 14:06:38 -07:00
color.h	config: inline git_color_default_config	2023-06-28 14:06:38 -07:00
column.c	treewide: remove cache.h inclusion due to pager.h changes	2023-04-11 08:52:11 -07:00
column.h	…
combine-diff.c	treewide: remove unnecessary includes for wrapper.h	2023-07-05 11:41:59 -07:00
command-list.txt	…
commit-graph.c	commit-graph: retain commit slab when closing NULL commit_graph	2024-01-05 08:35:26 -08:00
commit-graph.h	object-store-ll.h: split this header out of object-store.h	2023-06-21 13:39:54 -07:00
commit-reach.c	commit-reach: free temporary list in get_octopus_merge_bases()	2023-10-03 14:28:23 -07:00
commit-reach.h	…
commit-slab-decl.h	…
commit-slab-impl.h	…
commit-slab.h	…
commit.c	Merge branch 'rs/pack-objects-parseopt-fix'	2023-07-28 09:45:22 -07:00
commit.h	commit.h: reduce unnecessary includes	2023-04-24 12:47:33 -07:00
common-main.c	treewide: remove cache.h inclusion due to previous changes	2023-04-24 12:47:33 -07:00
config.c	add core.maxTreeDepth config	2023-08-31 15:51:07 -07:00
config.h	config: pass source to config_parser_event_fn_t	2023-06-28 14:06:40 -07:00
config.mak.dev	…
config.mak.in	…
config.mak.uname	win32: add a helper to run `git.exe` without a foreground window	2023-08-09 13:58:13 -07:00
configure.ac	configure.ac: always save NO_ICONV to config.status	2023-07-19 10:07:55 -07:00
connect.c	Merge branch 'gc/config-context'	2023-07-06 11:54:48 -07:00
connect.h	v0 protocol: use size_t for capability length/offset	2023-04-14 15:08:13 -07:00
connected.c	object-store-ll.h: split this header out of object-store.h	2023-06-21 13:39:54 -07:00
connected.h	…
convert.c	Merge branch 'cw/compat-util-header-cleanup'	2023-07-17 11:30:42 -07:00
convert.h	hash-ll.h: split out of hash.h to remove dependency on repository.h	2023-04-24 12:47:32 -07:00
copy.c	treewide: remove unnecessary includes for wrapper.h	2023-07-05 11:41:59 -07:00
copy.h	copy.h: move declarations for copy.c functions from cache.h	2023-04-24 12:47:31 -07:00
credential.c	credential: mark unused parameter in urlmatch callback	2023-08-29 17:56:26 -07:00
credential.h	credential: avoid erasing distinct password	2023-06-15 13:26:39 -07:00
csum-file.c	Merge branch 'ew/hash-with-openssl-evp'	2023-09-13 10:07:57 -07:00
csum-file.h	hash-ll.h: split out of hash.h to remove dependency on repository.h	2023-04-24 12:47:32 -07:00
ctype.c	kwset: move translation table from ctype	2023-07-05 11:41:18 -07:00
daemon.c	Merge branch 'cw/compat-util-header-cleanup'	2023-07-17 11:30:42 -07:00
date.c	Merge branch 'en/header-split-cache-h-part-2'	2023-05-09 16:45:46 -07:00
date.h	date: remove approxidate_relative()	2023-04-10 08:46:40 -07:00
decorate.c	hash-ll, hashmap: move oidhash() to hash-ll	2023-06-21 13:39:54 -07:00
decorate.h	…
delta-islands.c	Merge branch 'cw/compat-util-header-cleanup'	2023-07-17 11:30:42 -07:00
delta-islands.h	…
delta.h	…
detect-compiler	Handle some compiler versions containing a dash	2023-04-26 09:20:50 -07:00
diagnose.c	object-store-ll.h: split this header out of object-store.h	2023-06-21 13:39:54 -07:00
diagnose.h	…
diff-delta.c	…
diff-lib.c	Merge branch 'js/diff-cached-fsmonitor-fix'	2023-09-20 10:44:57 -07:00
diff-merges.c	…
diff-merges.h	…
diff-no-index.c	Merge branch 'pw/diff-no-index-from-named-pipes'	2023-09-20 10:44:57 -07:00
diff.c	diff --stat: add config option to limit filename width	2023-09-18 09:39:07 -07:00
diff.h	diff: drop useless "status" parameter from diff_result_code()	2023-08-21 15:33:24 -07:00
diffcore-break.c	diff.h: remove unnecessary include of oidset.h	2023-06-21 13:39:53 -07:00
diffcore-delta.c	…
diffcore-order.c	git-compat-util.h: remove unneccessary include of wildmatch.h	2023-06-21 13:39:54 -07:00
diffcore-pickaxe.c	diff.h: remove unnecessary include of oidset.h	2023-06-21 13:39:53 -07:00
diffcore-rename.c	git-compat-util: move alloc macros to git-compat-util.h	2023-07-05 11:42:31 -07:00
diffcore-rotate.c	…
diffcore.h	hash-ll.h: split out of hash.h to remove dependency on repository.h	2023-04-24 12:47:32 -07:00
dir-iterator.c	git-compat-util: move alloc macros to git-compat-util.h	2023-07-05 11:42:31 -07:00
dir-iterator.h	…
dir.c	Merge branch 'jc/pathspec-match-with-common-prefix'	2023-07-17 11:30:43 -07:00
dir.h	Merge branch 'cw/strbuf-cleanup'	2023-07-06 11:54:46 -07:00
editor.c	treewide: remove unnecessary includes for wrapper.h	2023-07-05 11:41:59 -07:00
editor.h	editor: move editor-related functions and declarations into common file	2023-04-11 08:52:10 -07:00
entry.c	treewide: remove unnecessary includes for wrapper.h	2023-07-05 11:41:59 -07:00
entry.h	…
environment.c	lower core.maxTreeDepth default to 2048	2023-08-31 15:51:08 -07:00
environment.h	add core.maxTreeDepth config	2023-08-31 15:51:07 -07:00
exec-cmd.c	run-command.h: move declarations for run-command.c from cache.h	2023-06-21 13:39:53 -07:00
exec-cmd.h	…
fetch-negotiator.c	…
fetch-negotiator.h	…
fetch-pack.c	Merge branch 'ts/unpacklimit-config-fix'	2023-08-30 13:50:41 -07:00
fetch-pack.h	…
fmt-merge-msg.c	Merge branch 'cw/compat-util-header-cleanup'	2023-07-17 11:30:42 -07:00
fmt-merge-msg.h	config: add ctx arg to config_fn_t	2023-06-28 14:06:39 -07:00
fsck.c	fsck: detect very large tree pathnames	2023-08-31 15:51:07 -07:00
fsck.h	fsck: detect very large tree pathnames	2023-08-31 15:51:07 -07:00
fsmonitor--daemon.h	fsmonitor: reduce includes of cache.h	2023-04-24 12:47:33 -07:00
fsmonitor-ipc.c	fsmonitor: mark unused parameters in stub functions	2023-09-18 15:56:15 -07:00
fsmonitor-ipc.h	…
fsmonitor-ll.h	fsmonitor-ll.h: split this header out of fsmonitor.h	2023-06-21 13:39:54 -07:00
fsmonitor-path-utils.h	…
fsmonitor-settings.c	fsmonitor: mark some maybe-unused parameters	2023-09-18 15:56:14 -07:00
fsmonitor-settings.h	…
fsmonitor.c	cache.h: remove this no-longer-used header	2023-06-21 13:39:53 -07:00
fsmonitor.h	fsmonitor-ll.h: split this header out of fsmonitor.h	2023-06-21 13:39:54 -07:00
generate-cmdlist.sh	…
generate-configlist.sh	…
generate-hooklist.sh	…
gettext.c	Sync with Git 2.40.1	2023-04-24 22:31:32 -07:00
gettext.h	Sync with 2.33.8	2023-04-17 21:15:56 +02:00
git-archimport.perl	…
git-compat-util.h	Merge branch 'mp/rebase-label-length-limit'	2023-08-24 09:32:33 -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-quiltimport.sh	…
git-request-pull.sh	…
git-send-email.perl	git-send-email.perl: avoid printing undef when validating addresses	2023-09-18 12:04:30 -07:00
git-sh-i18n.sh	…
git-sh-setup.sh	…
git-submodule.sh	…
git-svn.perl	git-svn: drop FakeTerm hack	2023-08-30 17:20:31 -07:00
git-web--browse.sh	…
git-zlib.c	git-zlib: move declarations for git-zlib functions from cache.h	2023-04-11 08:52:10 -07:00
git-zlib.h	git-zlib: move declarations for git-zlib functions from cache.h	2023-04-11 08:52:10 -07:00
git.c	Merge branch 'en/header-split-cache-h-part-3'	2023-06-29 16:43:21 -07:00
git.rc	…
gpg-interface.c	Merge branch 'cw/compat-util-header-cleanup'	2023-07-17 11:30:42 -07:00
gpg-interface.h	…
graph.c	diff --stat: add config option to limit filename width	2023-09-18 09:39:07 -07:00
graph.h	…
grep.c	grep: mark unused parmaeters in pcre fallbacks	2023-08-29 17:56:26 -07:00
grep.h	config: add ctx arg to config_fn_t	2023-06-28 14:06:39 -07:00
hash-ll.h	Merge branch 'ew/hash-with-openssl-evp'	2023-08-09 16:18:15 -07:00
hash-lookup.c	cache.h: remove this no-longer-used header	2023-06-21 13:39:53 -07:00
hash-lookup.h	…
hash.h	hash-ll.h: split out of hash.h to remove dependency on repository.h	2023-04-24 12:47:32 -07:00
hashmap.c	…
hashmap.h	hash-ll, hashmap: move oidhash() to hash-ll	2023-06-21 13:39:54 -07:00
help.c	Merge branch 'cw/compat-util-header-cleanup'	2023-07-17 11:30:42 -07:00
help.h	…
hex.c	hex: retire get_sha1_hex()	2023-07-24 16:11:23 -07:00
hex.h	hex: retire get_sha1_hex()	2023-07-24 16:11:23 -07:00
hook.c	abspath: move related functions to abspath	2023-06-12 13:49:35 -07:00
hook.h	…
http-backend.c	Merge branch 'tb/refs-exclusion-and-packed-refs'	2023-07-21 13:47:26 -07:00
http-fetch.c	treewide: remove cache.h inclusion due to object-file.h changes	2023-04-11 08:52:10 -07:00
http-push.c	http-push: mark unused parameter in xml callback	2023-07-13 17:23:59 -07:00
http-walker.c	object-store-ll.h: split this header out of object-store.h	2023-06-21 13:39:54 -07:00
http.c	Merge branch 'jk/redact-h2h3-headers-fix'	2023-09-22 17:01:36 -07:00
http.h	Sync with 2.30.9	2023-04-17 21:15:44 +02:00
ident.c	Merge branch 'bc/ident-dot-is-no-longer-crud-letter'	2023-08-09 16:18:15 -07:00
ident.h	config: add ctx arg to config_fn_t	2023-06-28 14:06:39 -07:00
imap-send.c	imap-send: mark unused parameters with NO_OPENSSL	2023-08-29 17:56:26 -07:00
iterator.h	…
json-writer.c	…
json-writer.h	…
khash.h	hash-ll, hashmap: move oidhash() to hash-ll	2023-06-21 13:39:54 -07:00
kwset.c	kwset: move translation table from ctype	2023-07-05 11:41:18 -07:00
kwset.h	kwset: move translation table from ctype	2023-07-05 11:41:18 -07:00
levenshtein.c	…
levenshtein.h	…
line-log.c	git-compat-util: move alloc macros to git-compat-util.h	2023-07-05 11:42:31 -07:00
line-log.h	…
line-range.c	…
line-range.h	…
linear-assignment.c	…
linear-assignment.h	…
list-objects-filter-options.c	git-compat-util: move alloc macros to git-compat-util.h	2023-07-05 11:42:31 -07:00
list-objects-filter-options.h	list-objects-filter-options.h: remove unneccessary include	2023-06-21 13:39:53 -07:00
list-objects-filter.c	git-compat-util: move alloc macros to git-compat-util.h	2023-07-05 11:42:31 -07:00
list-objects-filter.h	…
list-objects.c	list-objects: respect max_allowed_tree_depth	2023-08-31 15:51:08 -07:00
list-objects.h	…
list.h	…
lockfile.c	…
lockfile.h	…
log-tree.c	decorate: use commit color for HEAD arrow	2023-08-21 11:40:10 -07:00
log-tree.h	pretty: add pointer and tag options to %(decorate)	2023-08-21 11:40:10 -07:00
ls-refs.c	Merge branch 'tb/refs-exclusion-and-packed-refs'	2023-07-21 13:47:26 -07:00
ls-refs.h	…
mailinfo.c	config: add ctx arg to config_fn_t	2023-06-28 14:06:39 -07:00
mailinfo.h	…
mailmap.c	object-store-ll.h: split this header out of object-store.h	2023-06-21 13:39:54 -07:00
mailmap.h	mailmap, quote: move declarations of global vars to correct unit	2023-04-11 08:52:11 -07:00
match-trees.c	object-store-ll.h: split this header out of object-store.h	2023-06-21 13:39:54 -07:00
match-trees.h	match-trees.h: move declarations for match-trees.c functions from cache.h	2023-04-24 12:47:32 -07:00
mem-pool.c	…
mem-pool.h	…
merge-blobs.c	object-store-ll.h: split this header out of object-store.h	2023-06-21 13:39:54 -07:00
merge-blobs.h	…
merge-ll.c	Merge branch 'cw/compat-util-header-cleanup'	2023-07-17 11:30:42 -07:00
merge-ll.h	merge-ll: rename from ll-merge	2023-06-21 13:39:54 -07:00
merge-ort-wrappers.c	cache.h: remove this no-longer-used header	2023-06-21 13:39:53 -07:00
merge-ort-wrappers.h	…
merge-ort.c	merge-ort: lowercase a few error messages	2023-09-16 17:26:53 -07:00
merge-ort.h	hash-ll.h: split out of hash.h to remove dependency on repository.h	2023-04-24 12:47:32 -07:00
merge-recursive.c	merge-ort: lowercase a few error messages	2023-09-16 17:26:53 -07:00
merge-recursive.h	…
merge.c	diff.h: remove unnecessary include of oidset.h	2023-06-21 13:39:53 -07:00
merge.h	merge.h: move declarations for merge.c from cache.h	2023-06-21 13:39:53 -07:00
mergesort.h	…
midx.c	Merge branch 'tb/object-access-overflow-protection'	2023-07-25 12:05:23 -07:00
midx.h	…
name-hash.c	cache.h: remove this no-longer-used header	2023-06-21 13:39:53 -07:00
name-hash.h	name-hash.h: move declarations for name-hash.c from cache.h	2023-06-21 13:39:53 -07:00
notes-cache.c	object-store-ll.h: split this header out of object-store.h	2023-06-21 13:39:54 -07:00
notes-cache.h	…
notes-merge.c	treewide: remove unnecessary includes for wrapper.h	2023-07-05 11:41:59 -07:00
notes-merge.h	…
notes-utils.c	config: add ctx arg to config_fn_t	2023-06-28 14:06:39 -07:00
notes-utils.h	…
notes.c	Merge branch 'gc/config-context'	2023-07-06 11:54:48 -07:00
notes.h	notes: move the documentation to the struct	2023-06-06 09:35:05 +09:00
object-file.c	Merge branch 'jk/unused-parameter'	2023-07-25 12:05:24 -07:00
object-file.h	hash-ll.h: split out of hash.h to remove dependency on repository.h	2023-04-24 12:47:32 -07:00
object-name.c	Merge branch 'cw/strbuf-cleanup'	2023-07-06 11:54:46 -07:00
object-name.h	object-name: move related functions to object-name	2023-06-12 13:49:36 -07:00
object-store-ll.h	Merge branch 'tb/object-access-overflow-protection'	2023-07-25 12:05:23 -07:00
object-store.h	packfile.c: prevent overflow in `load_idx()`	2023-07-14 09:31:34 -07:00
object.c	Merge branch 'en/header-split-cache-h-part-3'	2023-06-29 16:43:21 -07:00
object.h	Merge branch 'tb/pack-bitmap-traversal-with-boundary'	2023-06-22 16:29:05 -07:00
oid-array.c	git-compat-util: move alloc macros to git-compat-util.h	2023-07-05 11:42:31 -07:00
oid-array.h	…
oidmap.c	hash-ll.h: split out of hash.h to remove dependency on repository.h	2023-04-24 12:47:32 -07:00
oidmap.h	read-cache*.h: move declarations for read-cache.c functions from cache.h	2023-06-21 13:39:53 -07:00
oidset.c	…
oidset.h	…
oidtree.c	git-compat-util: move alloc macros to git-compat-util.h	2023-07-05 11:42:31 -07:00
oidtree.h	hash-ll.h: split out of hash.h to remove dependency on repository.h	2023-04-24 12:47:32 -07:00
pack-bitmap-write.c	git-compat-util: move alloc macros to git-compat-util.h	2023-07-05 11:42:31 -07:00
pack-bitmap.c	pack-bitmap: mark unused parameters in show_object callback	2023-08-29 17:56:24 -07:00
pack-bitmap.h	Merge branch 'tb/pack-bitmap-traversal-with-boundary'	2023-06-22 16:29:05 -07:00
pack-check.c	object-store-ll.h: split this header out of object-store.h	2023-06-21 13:39:54 -07:00
pack-mtimes.c	object-store-ll.h: split this header out of object-store.h	2023-06-21 13:39:54 -07:00
pack-mtimes.h	…
pack-objects.c	git-compat-util: move alloc macros to git-compat-util.h	2023-07-05 11:42:31 -07:00
pack-objects.h	object-store-ll.h: split this header out of object-store.h	2023-06-21 13:39:54 -07:00
pack-revindex.c	object-store-ll.h: split this header out of object-store.h	2023-06-21 13:39:54 -07:00
pack-revindex.h	fsck: validate .rev file header	2023-04-17 14:39:05 -07:00
pack-write.c	treewide: remove unnecessary includes for wrapper.h	2023-07-05 11:41:59 -07:00
pack.h	…
packfile.c	Merge branch 'jc/retire-get-sha1-hex'	2023-08-04 10:52:30 -07:00
packfile.h	packfile.h: move pack_window and pack_entry from cache.h	2023-04-24 12:47:31 -07:00
pager.c	config: add ctx arg to config_fn_t	2023-06-28 14:06:39 -07:00
pager.h	pager.h: move declarations for pager.c functions from cache.h	2023-04-11 08:52:10 -07:00
parallel-checkout.c	git-compat-util: move alloc macros to git-compat-util.h	2023-07-05 11:42:31 -07:00
parallel-checkout.h	…
parse-options-cb.c	parse-options: mark unused parameters in noop callback	2023-09-05 14:48:17 -07:00
parse-options.c	parse-options: allow omitting option help text	2023-08-28 08:20:20 -07:00
parse-options.h	fetch: reject --no-ipv[46]	2023-07-18 14:47:30 -07:00
patch-delta.c	…
patch-ids.c	diff.h: remove unnecessary include of oidset.h	2023-06-21 13:39:53 -07:00
patch-ids.h	…
path.c	Merge branch 'cw/compat-util-header-cleanup'	2023-07-17 11:30:42 -07:00
path.h	path: move related function to path	2023-06-12 13:49:36 -07:00
pathspec.c	git-compat-util.h: remove unneccessary include of wildmatch.h	2023-06-21 13:39:54 -07:00
pathspec.h	Merge branch 'jk/log-follow-with-non-literal-pathspec'	2023-06-20 15:53:13 -07:00
pkt-line.c	Merge branch 'cw/compat-util-header-cleanup'	2023-07-17 11:30:42 -07:00
pkt-line.h	pkt-line: add size parameter to packet_length()	2023-07-07 15:30:16 -07:00
preload-index.c	cache.h: remove this no-longer-used header	2023-06-21 13:39:53 -07:00
preload-index.h	preload-index.h: move declarations for preload-index.c from elsewhere	2023-06-21 13:39:53 -07:00
pretty.c	pretty: add pointer and tag options to %(decorate)	2023-08-21 11:40:10 -07:00
pretty.h	…
prio-queue.c	git-compat-util: move alloc macros to git-compat-util.h	2023-07-05 11:42:31 -07:00
prio-queue.h	…
progress.c	hash-ll.h: split out of hash.h to remove dependency on repository.h	2023-04-24 12:47:32 -07:00
progress.h	…
promisor-remote.c	Merge branch 'gc/config-context'	2023-07-06 11:54:48 -07:00
promisor-remote.h	…
prompt.c	…
prompt.h	…
protocol-caps.c	object-store-ll.h: split this header out of object-store.h	2023-06-21 13:39:54 -07:00
protocol-caps.h	…
protocol.c	treewide: remove unnecessary cache.h inclusion	2023-04-11 08:52:09 -07:00
protocol.h	protocol.h: move definition of DEFAULT_GIT_PORT from cache.h	2023-04-18 14:01:04 -07:00
prune-packed.c	object-store-ll.h: split this header out of object-store.h	2023-06-21 13:39:54 -07:00
prune-packed.h	…
quote.c	git-compat-util: move alloc macros to git-compat-util.h	2023-07-05 11:42:31 -07:00
quote.h	mailmap, quote: move declarations of global vars to correct unit	2023-04-11 08:52:11 -07:00
range-diff.c	Merge branch 'kh/range-diff-notes'	2023-09-29 09:04:15 -07:00
range-diff.h	…
reachable.c	Merge branch 'en/header-split-cache-h-part-3'	2023-06-29 16:43:21 -07:00
reachable.h	…
read-cache-ll.h	read-cache*.h: move declarations for read-cache.c functions from cache.h	2023-06-21 13:39:53 -07:00
read-cache.c	Merge branch 'cw/compat-util-header-cleanup'	2023-07-17 11:30:42 -07:00
read-cache.h	read-cache*.h: move declarations for read-cache.c functions from cache.h	2023-06-21 13:39:53 -07:00
rebase-interactive.c	Merge branch 'cw/compat-util-header-cleanup'	2023-07-17 11:30:42 -07:00
rebase-interactive.h	…
rebase.c	…
rebase.h	…
ref-filter.c	Merge branch 'ks/ref-filter-sort-numerically'	2023-09-14 11:16:59 -07:00
ref-filter.h	builtin/for-each-ref.c: add `--exclude` option	2023-07-10 14:48:55 -07:00
reflog-walk.c	git-compat-util: move alloc macros to git-compat-util.h	2023-07-05 11:42:31 -07:00
reflog-walk.h	…
reflog.c	object-store-ll.h: split this header out of object-store.h	2023-06-21 13:39:54 -07:00
reflog.h	…
refs.c	Merge branch 'jk/unused-parameter'	2023-07-25 12:05:24 -07:00
refs.h	Merge branch 'tb/refs-exclusion-and-packed-refs'	2023-07-21 13:47:26 -07:00
refspec.c	git-compat-util: move alloc macros to git-compat-util.h	2023-07-05 11:42:31 -07:00
refspec.h	…
remote-curl.c	Merge branch 'cw/compat-util-header-cleanup'	2023-07-17 11:30:42 -07:00
remote.c	Merge branch 'ah/advise-force-pushing'	2023-07-25 12:05:23 -07:00
remote.h	wt-status: don't show divergence advice when committing	2023-07-13 09:14:58 -07:00
replace-object.c	Merge branch 'en/header-split-cache-h-part-3'	2023-06-29 16:43:21 -07:00
replace-object.h	Merge branch 'en/header-split-cache-h-part-3'	2023-06-29 16:43:21 -07:00
repo-settings.c	repository: create read_replace_refs setting	2023-06-12 13:34:55 -07:00
repository.c	object-store-ll.h: split this header out of object-store.h	2023-06-21 13:39:54 -07:00
repository.h	Merge branch 'en/header-split-cache-h-part-3'	2023-06-29 16:43:21 -07:00
rerere.c	Merge branch 'jc/unresolve-removal'	2023-10-02 11:20:00 -07:00
rerere.h	…
reset.c	object-name.h: move declarations for object-name.c functions from cache.h	2023-04-11 08:52:09 -07:00
reset.h	hash-ll.h: split out of hash.h to remove dependency on repository.h	2023-04-24 12:47:32 -07:00
resolve-undo.c	Merge branch 'jc/unresolve-removal'	2023-10-02 11:20:00 -07:00
resolve-undo.h	checkout: allow "checkout -m path" to unmerge removed paths	2023-07-31 16:16:44 -07:00
revision.c	range-diff: treat notes like `log`	2023-09-19 14:40:19 -07:00
revision.h	range-diff: treat notes like `log`	2023-09-19 14:40:19 -07:00
run-command.c	Merge branch 'ma/locate-in-path-for-windows'	2023-08-09 16:18:16 -07:00
run-command.h	cache.h: remove this no-longer-used header	2023-06-21 13:39:53 -07:00
sane-ctype.h	sane-ctype.h: create header for sane-ctype macros	2023-07-05 11:41:18 -07:00
scalar.c	Merge branch 'ds/scalar-updates'	2023-08-29 13:51:44 -07:00
send-pack.c	treewide: remove unnecessary includes for wrapper.h	2023-07-05 11:41:59 -07:00
send-pack.h	…
sequencer.c	Merge branch 'ob/sequencer-remove-dead-code'	2023-09-20 10:44:58 -07:00
sequencer.h	rebase -m: cleanup --strategy-option handling	2023-04-10 09:53:19 -07:00
serve.c	hash-ll, hashmap: move oidhash() to hash-ll	2023-06-21 13:39:54 -07:00
serve.h	…
server-info.c	git-compat-util: move alloc macros to git-compat-util.h	2023-07-05 11:42:31 -07:00
server-info.h	server-info.h: move declarations for server-info.c functions from cache.h	2023-04-24 12:47:31 -07:00
setup.c	Merge branch 'ds/scalar-updates'	2023-08-29 13:51:44 -07:00
setup.h	Merge branch 'ds/scalar-updates'	2023-08-29 13:51:44 -07:00
sh-i18n--envsubst.c	…
sha1dc_git.c	…
sha1dc_git.h	…
shallow.c	git-compat-util: move alloc macros to git-compat-util.h	2023-07-05 11:42:31 -07:00
shallow.h	…
shared.mak	…
shell.c	…
shortlog.h	…
sideband.c	treewide: remove cache.h inclusion due to editor.h changes	2023-04-11 08:52:10 -07:00
sideband.h	…
sigchain.c	git-compat-util: move alloc macros to git-compat-util.h	2023-07-05 11:42:31 -07:00
sigchain.h	…
simple-ipc.h	…
sparse-index.c	read_tree(): respect max_allowed_tree_depth	2023-08-31 15:51:08 -07:00
sparse-index.h	sparse-index.h: move declarations for sparse-index.c from cache.h	2023-06-21 13:39:53 -07:00
split-index.c	git-compat-util: move alloc macros to git-compat-util.h	2023-07-05 11:42:31 -07:00
split-index.h	hash-ll.h: split out of hash.h to remove dependency on repository.h	2023-04-24 12:47:32 -07:00
stable-qsort.c	…
statinfo.c	statinfo: move stat_{data,validity} functions from cache/read-cache	2023-06-21 13:39:53 -07:00
statinfo.h	Merge branch 'en/header-split-cache-h-part-3'	2023-06-29 16:43:21 -07:00
strbuf.c	Merge branch 'rs/strbuf-addftime-simplify'	2023-07-25 12:05:24 -07:00
strbuf.h	Merge branch 'cw/compat-util-header-cleanup'	2023-07-17 11:30:42 -07:00
streaming.c	treewide: remove unnecessary includes for wrapper.h	2023-07-05 11:41:59 -07:00
streaming.h	…
string-list.c	git-compat-util: move alloc macros to git-compat-util.h	2023-07-05 11:42:31 -07:00
string-list.h	string-list: introduce `string_list_setlen()`	2023-04-24 16:01:28 -07:00
strmap.c	…
strmap.h	…
strvec.c	git-compat-util: move alloc macros to git-compat-util.h	2023-07-05 11:42:31 -07:00
strvec.h	…
sub-process.c	…
sub-process.h	…
submodule-config.c	Merge branch 'cw/compat-util-header-cleanup'	2023-07-17 11:30:42 -07:00
submodule-config.h	config: pass kvi to die_bad_number()	2023-06-28 14:06:40 -07:00
submodule.c	git-compat-util: move alloc macros to git-compat-util.h	2023-07-05 11:42:31 -07:00
submodule.h	…
symlinks.c	symlinks.h: move declarations for symlinks.c functions from cache.h	2023-04-24 12:47:31 -07:00
symlinks.h	symlinks.h: move declarations for symlinks.c functions from cache.h	2023-04-24 12:47:31 -07:00
tag.c	treewide: remove unnecessary includes for wrapper.h	2023-07-05 11:41:59 -07:00
tag.h	…
tar.h	…
tempfile.c	Merge branch 'cw/compat-util-header-cleanup'	2023-07-17 11:30:42 -07:00
tempfile.h	…
thread-utils.c	…
thread-utils.h	…
tmp-objdir.c	object-store-ll.h: split this header out of object-store.h	2023-06-21 13:39:54 -07:00
tmp-objdir.h	…
trace.c	treewide: remove unnecessary includes for wrapper.h	2023-07-05 11:41:59 -07:00
trace.h	…
trace2.c	wrapper: use trace2 counters to collect fsync stats	2023-07-20 11:52:53 -07:00
trace2.h	Merge branch 'bb/use-trace2-counters-for-fsync-stats'	2023-08-02 09:37:23 -07:00
trailer.c	trailer: split process_command_line_args into separate functions	2023-09-11 10:01:19 -07:00
trailer.h	trailer: separate public from internal portion of trailer_iterator	2023-09-11 10:01:18 -07:00
transport-helper.c	treewide: remove unnecessary includes for wrapper.h	2023-07-05 11:41:59 -07:00
transport-internal.h	…
transport.c	git-compat-util: move alloc macros to git-compat-util.h	2023-07-05 11:42:31 -07:00
transport.h	…
tree-diff.c	tree-diff: respect max_allowed_tree_depth	2023-08-31 15:51:08 -07:00
tree-walk.c	traverse_trees(): respect max_allowed_tree_depth	2023-08-31 15:51:08 -07:00
tree-walk.h	tree-walk: drop MAX_TRAVERSE_TREES macro	2023-08-31 15:51:07 -07:00
tree.c	read_tree(): respect max_allowed_tree_depth	2023-08-31 15:51:08 -07:00
tree.h	read_tree(): respect max_allowed_tree_depth	2023-08-31 15:51:08 -07:00
unicode-width.h	…
unimplemented.sh	…
unix-socket.c	…
unix-socket.h	…
unix-stream-server.c	…
unix-stream-server.h	…
unpack-trees.c	tree-walk: reduce stack size for recursive functions	2023-08-31 15:51:07 -07:00
unpack-trees.h	tree-walk: drop MAX_TRAVERSE_TREES macro	2023-08-31 15:51:07 -07:00
upload-pack.c	Merge branch 'ds/upload-pack-error-sequence-fix'	2023-08-24 09:32:33 -07:00
upload-pack.h	…
url.c	…
url.h	…
urlmatch.c	config: add ctx arg to config_fn_t	2023-06-28 14:06:39 -07:00
urlmatch.h	config: add ctx arg to config_fn_t	2023-06-28 14:06:39 -07:00
usage.c	treewide: remove unnecessary includes for wrapper.h	2023-07-05 11:41:59 -07:00
userdiff.c	git-compat-util: move alloc macros to git-compat-util.h	2023-07-05 11:42:31 -07:00
userdiff.h	Merge branch 'rs/userdiff-multibyte-regex'	2023-04-20 14:33:35 -07:00
utf8.c	…
utf8.h	…
varint.c	…
varint.h	…
version.c	…
version.h	…
versioncmp.c	git-compat-util: move strbuf.c funcs to its header	2023-07-05 11:41:18 -07:00
versioncmp.h	versioncmp.h: move declarations for versioncmp.c functions from cache.h	2023-04-24 12:47:32 -07:00
walker.c	object-store-ll.h: split this header out of object-store.h	2023-06-21 13:39:54 -07:00
walker.h	…
wildmatch.c	…
wildmatch.h	…
worktree.c	worktree: mark unused parameters in noop repair callback	2023-08-29 17:56:25 -07:00
worktree.h	…
wrap-for-bin.sh	…
wrapper.c	maintenance: add get_random_minute()	2023-08-10 14:04:16 -07:00
wrapper.h	maintenance: add get_random_minute()	2023-08-10 14:04:16 -07:00
write-or-die.c	treewide: remove unnecessary includes for wrapper.h	2023-07-05 11:41:59 -07:00
write-or-die.h	…
ws.c	Merge branch 'jc/attr-source-tree'	2023-05-17 10:11:41 -07:00
ws.h	ws.h: move declarations for ws.c functions from cache.h	2023-04-24 12:47:32 -07:00
wt-status.c	Merge branch 'jk/tree-name-and-depth-limit'	2023-09-14 11:16:59 -07:00
wt-status.h	…
xdiff-interface.c	Merge branch 'gc/config-context'	2023-07-06 11:54:48 -07:00
xdiff-interface.h	config: add ctx arg to config_fn_t	2023-06-28 14:06:39 -07:00

README.md

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 with just "subscribe git" in the body to majordomo@vger.kernel.org (not the Git list). 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