Go to file

Glen Choo a53f43f900 config: don't BUG when both kvi and source are set When iterating through config, we read config source metadata from global values - either a "struct config_source + enum config_scope" or a "struct key_value_info", using the current_config* functions. Prior to the series starting from `0c60285147` (config.c: create config_reader and the_reader, 2023-03-28), we weren't very picky about which values we should read in which situation; we did note that both groups of values generally shouldn't be set together, but if both were set, current_config* preferentially reads key_value_info. When that series added more structure, we enforced that either the former (when parsing a config source) can be set, or the latter (when iterating a config set), but never both at the same time. See `9828453ff0` (config.c: remove current_config_kvi, 2023-03-28) and `5cdf18e7cd` (config.c: remove current_parsing_scope, 2023-03-28). That was a good simplifying constraint that helped us reason about the global state, but it turns out that there is at least one situation where we need both to be set at the same time: in a blobless partial clone where .gitmodules is missing. "git fetch" in such a repo will start a config parse over .gitmodules (setting the config_source), and Git will attempt to lazy-fetch it from the promisor remote. However, when we try to read the promisor configuration, we start iterating a config set (setting the key_value_info), and we BUG() out because that's not allowed any more. Teaching config_reader to gracefully handle this is somewhat complicated, but fortunately, there are proposed changes to the config.c machinery to get rid of this global state, and make the BUG() obsolete [1]. We should rely on that as the eventual solution, and avoid doing yet another refactor in the meantime. Therefore, fix the bug by removing the BUG() check. We're reverting to an older, less safe state, but that's generally okay since key_value_info is always preferentially read, so we'd always read the correct values when we iterate a config set in the middle of a config parse (like we are here). The reverse would be wrong, but extremely unlikely to happen since very few callers parse config without going through a config set. [1] https://lore.kernel.org/git/pull.1497.v3.git.git.1687290231.gitgitgadget@gmail.com Signed-off-by: Glen Choo <chooglen@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>		2023-06-26 12:07:47 -07:00
.github	Sync with 2.36.6	2023-04-17 21:16:04 +02:00
Documentation	Git 2.41-rc2	2023-05-25 05:55:19 +09:00
block-sha1	…
builtin	Merge branch 'jc/attr-source-tree'	2023-05-17 10:11:41 -07:00
ci	Sync with 2.36.6	2023-04-17 21:16:04 +02:00
compat	fsmonitor: reduce includes of cache.h	2023-04-24 12:47:33 -07:00
contrib	Merge branch 'sg/retire-unused-cocci'	2023-05-15 13:59:06 -07:00
ewah	…
git-gui	…
gitk-git	Merge gitk changes into js/gitk-fixes-from-gfw	2023-05-08 09:16:57 -07:00
gitweb	…
mergetools	…
negotiator	Merge branch 'hx/negotiator-non-recursive'	2023-05-10 10:23:28 -07:00
oss-fuzz	…
perl	…
po	l10n: zh_TW.po: Git 2.41.0	2023-06-01 00:53:09 +08:00
refs	Merge branch 'en/header-split-cache-h-part-2'	2023-05-09 16:45:46 -07:00
reftable	reftable: ensure git-compat-util.h is the first (indirect) include	2023-04-24 12:47:33 -07:00
sha1collisiondetection@855827c583	…
sha1dc	…
sha256	…
t	config: don't BUG when both kvi and source are set	2023-06-26 12:07:47 -07:00
templates	…
trace2	hash-ll.h: split out of hash.h to remove dependency on repository.h	2023-04-24 12:47:32 -07:00
xdiff	…
.cirrus.yml	…
.clang-format	…
.editorconfig	…
.gitattributes	…
.gitignore	…
.gitmodules	…
.mailmap	…
.tsan-suppressions	…
CODE_OF_CONDUCT.md	…
COPYING	…
GIT-VERSION-GEN	Git 2.41	2023-06-01 15:28:26 +09:00
INSTALL	Sync with 2.31.8	2023-04-17 21:15:49 +02:00
LGPL-2.1	…
Makefile	Merge branch 'en/header-split-cache-h'	2023-04-25 13:56:20 -07:00
README.md	…
RelNotes	Git 2.40.1	2023-04-17 21:16:10 +02:00
SECURITY.md	…
abspath.c	…
abspath.h	…
aclocal.m4	…
add-interactive.c	commit.h: reduce unnecessary includes	2023-04-24 12:47:33 -07:00
add-interactive.h	…
add-patch.c	…
advice.c	…
advice.h	…
alias.c	…
alias.h	…
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	…
apply.c	Merge branch 'en/header-split-cache-h-part-2'	2023-05-09 16:45:46 -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	…
archive-zip.c	treewide: remove cache.h inclusion due to previous changes	2023-04-24 12:47:33 -07:00
archive.c	Merge branch 'jc/attr-source-tree'	2023-05-17 10:11:41 -07:00
archive.h	…
attr.c	Merge branch 'jc/attr-source-tree'	2023-05-17 10:11:41 -07:00
attr.h	attr: teach "--attr-source=<tree>" global option to "git"	2023-05-06 14:34:09 -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	…
bisect.h	…
blame.c	Merge branch 'jk/blame-fake-commit-label'	2023-05-02 10:13:35 -07:00
blame.h	…
blob.c	…
blob.h	…
bloom.c	commit.h: reduce unnecessary includes	2023-04-24 12:47:33 -07:00
bloom.h	…
branch.c	Merge branch 'rj/branch-unborn-in-other-worktrees'	2023-05-15 13:59:03 -07:00
branch.h	…
builtin.h	…
bulk-checkin.c	…
bulk-checkin.h	…
bundle-uri.c	Merge branch 'en/header-split-cache-h-part-2'	2023-05-09 16:45:46 -07:00
bundle-uri.h	…
bundle.c	…
bundle.h	…
cache-tree.c	…
cache-tree.h	…
cache.h	cache.h: remove unnecessary headers	2023-04-24 12:47:33 -07:00
cbtree.c	…
cbtree.h	…
chdir-notify.c	…
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	hash-ll.h: split out of hash.h to remove dependency on repository.h	2023-04-24 12:47:32 -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	treewide: remove cache.h inclusion due to previous changes	2023-04-24 12:47:33 -07:00
color.h	…
column.c	…
column.h	…
combine-diff.c	commit.h: reduce unnecessary includes	2023-04-24 12:47:33 -07:00
command-list.txt	…
commit-graph.c	Merge branch 'en/header-split-cache-h-part-2'	2023-05-09 16:45:46 -07:00
commit-graph.h	…
commit-reach.c	…
commit-reach.h	…
commit-slab-decl.h	…
commit-slab-impl.h	…
commit-slab.h	…
commit.c	Merge branch 'en/header-split-cache-h-part-2'	2023-05-09 16:45:46 -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	config: don't BUG when both kvi and source are set	2023-06-26 12:07:47 -07:00
config.h	…
config.mak.dev	…
config.mak.in	…
config.mak.uname	…
configure.ac	…
connect.c	Merge branch 'jk/protocol-cap-parse-fix'	2023-04-25 13:56:20 -07:00
connect.h	…
connected.c	…
connected.h	…
convert.c	Merge branch 'jc/attr-source-tree'	2023-05-17 10:11:41 -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 cache.h inclusion due to previous changes	2023-04-24 12:47:33 -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	Merge branch 'mh/credential-oauth-refresh-token'	2023-05-10 10:23:29 -07:00
credential.h	Merge branch 'mh/credential-oauth-refresh-token'	2023-05-10 10:23:29 -07:00
csum-file.c	hash-ll.h: split out of hash.h to remove dependency on repository.h	2023-04-24 12:47:32 -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	…
daemon.c	treewide: remove cache.h inclusion due to previous changes	2023-04-24 12:47:33 -07:00
date.c	Merge branch 'en/header-split-cache-h-part-2'	2023-05-09 16:45:46 -07:00
date.h	…
decorate.c	…
decorate.h	…
delta-islands.c	…
delta-islands.h	…
delta.h	…
detect-compiler	Handle some compiler versions containing a dash	2023-04-26 09:20:50 -07:00
diagnose.c	Merge branch 'en/header-split-cache-h-part-2'	2023-05-09 16:45:46 -07:00
diagnose.h	…
diff-delta.c	…
diff-lib.c	symlinks.h: move declarations for symlinks.c functions from cache.h	2023-04-24 12:47:31 -07:00
diff-merges.c	…
diff-merges.h	…
diff-no-index.c	…
diff.c	Merge branch 'jc/dirstat-plug-leaks'	2023-05-15 13:59:05 -07:00
diff.h	Merge branch 'en/header-split-cache-h-part-2'	2023-05-09 16:45:46 -07:00
diffcore-break.c	…
diffcore-delta.c	…
diffcore-order.c	…
diffcore-pickaxe.c	…
diffcore-rename.c	…
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	…
dir-iterator.h	…
dir.c	commit.h: reduce unnecessary includes	2023-04-24 12:47:33 -07:00
dir.h	dir.h: move DTYPE defines from cache.h	2023-04-24 12:47:32 -07:00
editor.c	hash-ll.h: split out of hash.h to remove dependency on repository.h	2023-04-24 12:47:32 -07:00
editor.h	…
entry.c	symlinks.h: move declarations for symlinks.c functions from cache.h	2023-04-24 12:47:31 -07:00
entry.h	…
environment.c	treewide: remove cache.h inclusion due to previous changes	2023-04-24 12:47:33 -07:00
environment.h	attr: teach "--attr-source=<tree>" global option to "git"	2023-05-06 14:34:09 -07:00
exec-cmd.c	hash-ll.h: split out of hash.h to remove dependency on repository.h	2023-04-24 12:47:32 -07:00
exec-cmd.h	…
fetch-negotiator.c	…
fetch-negotiator.h	…
fetch-pack.c	Merge branch 'en/header-split-cache-h-part-2'	2023-05-09 16:45:46 -07:00
fetch-pack.h	…
fmt-merge-msg.c	…
fmt-merge-msg.h	…
fsck.c	commit.h: reduce unnecessary includes	2023-04-24 12:47:33 -07:00
fsck.h	…
fsmonitor--daemon.h	fsmonitor: reduce includes of cache.h	2023-04-24 12:47:33 -07:00
fsmonitor-ipc.c	hash-ll.h: split out of hash.h to remove dependency on repository.h	2023-04-24 12:47:32 -07:00
fsmonitor-ipc.h	…
fsmonitor-path-utils.h	…
fsmonitor-settings.c	…
fsmonitor-settings.h	…
fsmonitor.c	…
fsmonitor.h	Merge branch 'en/header-split-cache-h'	2023-04-25 13:56:20 -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 'en/header-split-cache-h'	2023-04-25 13:56:20 -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	Merge branch 'jc/send-email-pre-process-fix'	2023-05-19 09:27:06 -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	attr: teach "--attr-source=<tree>" global option to "git"	2023-05-06 14:34:09 -07:00
git.rc	…
gpg-interface.c	Merge branch 'en/header-split-cache-h-part-2'	2023-05-09 16:45:46 -07:00
gpg-interface.h	…
graph.c	…
graph.h	…
grep.c	Merge branch 'en/header-split-cache-h-part-2'	2023-05-09 16:45:46 -07:00
grep.h	…
hash-ll.h	hash-ll.h: split out of hash.h to remove dependency on repository.h	2023-04-24 12:47:32 -07:00
hash-lookup.c	hash-ll.h: split out of hash.h to remove dependency on repository.h	2023-04-24 12:47:32 -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	Merge branch 'en/header-split-cache-h-part-2'	2023-05-09 16:45:46 -07:00
help.c	…
help.h	…
hex.c	hash-ll.h: split out of hash.h to remove dependency on repository.h	2023-04-24 12:47:32 -07:00
hex.h	hash-ll.h: split out of hash.h to remove dependency on repository.h	2023-04-24 12:47:32 -07:00
hook.c	hash-ll.h: split out of hash.h to remove dependency on repository.h	2023-04-24 12:47:32 -07:00
hook.h	…
http-backend.c	…
http-fetch.c	…
http-push.c	Merge branch 'en/header-split-cache-h-part-2'	2023-05-09 16:45:46 -07:00
http-walker.c	Merge branch 'en/header-split-cache-h'	2023-04-25 13:56:20 -07:00
http.c	Merge branch 'jk/redact-h2h3-headers-fix' into maint-2.41	2023-06-24 15:04:48 -07:00
http.h	…
ident.c	…
ident.h	…
imap-send.c	imap-send: include strbuf.h	2023-05-17 09:54:07 -07:00
iterator.h	…
json-writer.c	…
json-writer.h	…
khash.h	hash-ll.h: split out of hash.h to remove dependency on repository.h	2023-04-24 12:47:32 -07:00
kwset.c	…
kwset.h	…
levenshtein.c	…
levenshtein.h	…
line-log.c	diff.h: reduce unnecessary includes	2023-04-24 12:47:33 -07:00
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	…
ll-merge.c	Merge branch 'jc/attr-source-tree'	2023-05-17 10:11:41 -07:00
ll-merge.h	…
lockfile.c	…
lockfile.h	…
log-tree.c	Merge branch 'en/header-split-cache-h-part-2'	2023-05-09 16:45:46 -07:00
log-tree.h	…
ls-refs.c	hash-ll.h: split out of hash.h to remove dependency on repository.h	2023-04-24 12:47:32 -07:00
ls-refs.h	…
mailinfo.c	…
mailinfo.h	…
mailmap.c	Merge branch 'en/header-split-cache-h'	2023-04-25 13:56:20 -07:00
mailmap.h	…
match-trees.c	treewide: remove cache.h inclusion due to previous changes	2023-04-24 12:47:33 -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	…
merge-blobs.h	…
merge-ort-wrappers.c	commit.h: reduce unnecessary includes	2023-04-24 12:47:33 -07:00
merge-ort-wrappers.h	…
merge-ort.c	Merge branch 'en/header-split-cache-h-part-2'	2023-05-09 16:45:46 -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	match-trees.h: move declarations for match-trees.c functions from cache.h	2023-04-24 12:47:32 -07:00
merge-recursive.h	…
merge.c	commit.h: reduce unnecessary includes	2023-04-24 12:47:33 -07:00
mergesort.h	…
midx.c	Merge branch 'en/header-split-cache-h-part-2'	2023-05-09 16:45:46 -07:00
midx.h	…
name-hash.c	…
notes-cache.c	commit.h: reduce unnecessary includes	2023-04-24 12:47:33 -07:00
notes-cache.h	…
notes-merge.c	…
notes-merge.h	…
notes-utils.c	commit.h: reduce unnecessary includes	2023-04-24 12:47:33 -07:00
notes-utils.h	…
notes.c	Merge branch 'tb/ban-strtok'	2023-05-02 10:13:35 -07:00
notes.h	…
object-file.c	Merge branch 'en/header-split-cache-h-part-2'	2023-05-09 16:45:46 -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 'en/header-split-cache-h-part-2'	2023-05-09 16:45:46 -07:00
object-name.h	…
object-store.h	Merge branch 'en/header-split-cache-h-part-2'	2023-05-09 16:45:46 -07:00
object.c	…
object.h	hash-ll.h: split out of hash.h to remove dependency on repository.h	2023-04-24 12:47:32 -07:00
oid-array.c	…
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	…
oidset.c	…
oidset.h	…
oidtree.c	…
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	diff.h: reduce unnecessary includes	2023-04-24 12:47:33 -07:00
pack-bitmap.c	fsck: verify checksums of all .bitmap files	2023-05-02 08:48:22 -07:00
pack-bitmap.h	fsck: verify checksums of all .bitmap files	2023-05-02 08:48:22 -07:00
pack-check.c	…
pack-mtimes.c	…
pack-mtimes.h	…
pack-objects.c	…
pack-objects.h	…
pack-revindex.c	Merge branch 'ds/fsck-pack-revindex'	2023-04-27 16:00:59 -07:00
pack-revindex.h	fsck: validate .rev file header	2023-04-17 14:39:05 -07:00
pack-write.c	Merge branch 'tb/enable-cruft-packs-by-default'	2023-04-28 16:03:03 -07:00
pack.h	…
packfile.c	Merge branch 'en/header-split-cache-h-part-2'	2023-05-09 16:45:46 -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	…
pager.h	…
parallel-checkout.c	hash-ll.h: split out of hash.h to remove dependency on repository.h	2023-04-24 12:47:32 -07:00
parallel-checkout.h	…
parse-options-cb.c	Merge branch 'en/header-split-cache-h-part-2'	2023-05-09 16:45:46 -07:00
parse-options.c	commit.h: reduce unnecessary includes	2023-04-24 12:47:33 -07:00
parse-options.h	Merge branch 'pw/rebase-cleanup-merge-strategy-option-handling'	2023-04-17 18:05:13 -07:00
patch-delta.c	…
patch-ids.c	…
patch-ids.h	…
path.c	…
path.h	…
pathspec.c	Merge branch 'jc/attr-source-tree'	2023-05-17 10:11:41 -07:00
pathspec.h	…
pkt-line.c	treewide: remove cache.h inclusion due to previous changes	2023-04-24 12:47:33 -07:00
pkt-line.h	pkt-line.h: move declarations for pkt-line.c functions from cache.h	2023-04-24 12:47:32 -07:00
preload-index.c	symlinks.h: move declarations for symlinks.c functions from cache.h	2023-04-24 12:47:31 -07:00
pretty.c	…
pretty.h	…
prio-queue.c	…
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	…
promisor-remote.h	…
prompt.c	…
prompt.h	…
protocol-caps.c	Merge branch 'en/header-split-cache-h-part-2'	2023-05-09 16:45:46 -07:00
protocol-caps.h	…
protocol.c	…
protocol.h	protocol.h: move definition of DEFAULT_GIT_PORT from cache.h	2023-04-18 14:01:04 -07:00
prune-packed.c	…
prune-packed.h	…
quote.c	…
quote.h	…
range-diff.c	treewide: remove cache.h inclusion due to previous changes	2023-04-24 12:47:33 -07:00
range-diff.h	…
reachable.c	…
reachable.h	…
read-cache.c	Merge branch 'en/header-split-cache-h-part-2'	2023-05-09 16:45:46 -07:00
rebase-interactive.c	hash-ll.h: split out of hash.h to remove dependency on repository.h	2023-04-24 12:47:32 -07:00
rebase-interactive.h	…
rebase.c	…
rebase.h	…
ref-filter.c	Merge branch 'en/header-split-cache-h-part-2'	2023-05-09 16:45:46 -07:00
ref-filter.h	…
reflog-walk.c	…
reflog-walk.h	…
reflog.c	diff.h: reduce unnecessary includes	2023-04-24 12:47:33 -07:00
reflog.h	…
refs.c	…
refs.h	…
refspec.c	commit.h: reduce unnecessary includes	2023-04-24 12:47:33 -07:00
refspec.h	…
remote-curl.c	Merge branch 'en/header-split-cache-h'	2023-04-25 13:56:20 -07:00
remote.c	Merge branch 'en/header-split-cache-h'	2023-04-25 13:56:20 -07:00
remote.h	…
replace-object.c	…
replace-object.h	…
repo-settings.c	Merge branch 'tb/enable-cruft-packs-by-default'	2023-04-28 16:03:03 -07:00
repository.c	…
repository.h	Merge branch 'tb/enable-cruft-packs-by-default'	2023-04-28 16:03:03 -07:00
rerere.c	copy.h: move declarations for copy.c functions from cache.h	2023-04-24 12:47:31 -07:00
rerere.h	…
reset.c	…
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	hash-ll.h: split out of hash.h to remove dependency on repository.h	2023-04-24 12:47:32 -07:00
resolve-undo.h	hash-ll.h: split out of hash.h to remove dependency on repository.h	2023-04-24 12:47:32 -07:00
revision.c	Merge branch 'en/header-split-cache-h'	2023-04-25 13:56:20 -07:00
revision.h	Merge branch 'en/header-split-cache-h-part-2'	2023-05-09 16:45:46 -07:00
run-command.c	Merge branch 'tb/run-command-needs-alloc-h'	2023-05-19 09:27:06 -07:00
run-command.h	…
scalar.c	Merge branch 'en/header-split-cache-h'	2023-04-25 13:56:20 -07:00
send-pack.c	Merge branch 'en/header-split-cache-h-part-2'	2023-05-09 16:45:46 -07:00
send-pack.h	…
sequencer.c	Merge branch 'js/rebase-count-fixes'	2023-05-20 05:35:57 +09:00
sequencer.h	…
serve.c	…
serve.h	…
server-info.c	server-info.h: move declarations for server-info.c functions from cache.h	2023-04-24 12:47: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	setup: trace bare repository setups	2023-05-01 11:20:33 -07:00
setup.h	…
sh-i18n--envsubst.c	…
sha1dc_git.c	…
sha1dc_git.h	…
shallow.c	…
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	hash-ll.h: split out of hash.h to remove dependency on repository.h	2023-04-24 12:47:32 -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.h	…
strbuf.c	hash-ll.h: split out of hash.h to remove dependency on repository.h	2023-04-24 12:47:32 -07:00
strbuf.h	…
streaming.c	…
streaming.h	…
string-list.c	string-list: introduce `string_list_setlen()`	2023-04-24 16:01:28 -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	…
strvec.h	…
sub-process.c	…
sub-process.h	…
submodule-config.c	object-store.h: reduce unnecessary includes	2023-04-24 12:47:33 -07:00
submodule-config.h	…
submodule.c	Merge branch 'en/header-split-cache-h'	2023-04-25 13:56:20 -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	…
tag.h	…
tar.h	…
tempfile.c	…
tempfile.h	…
thread-utils.c	…
thread-utils.h	…
tmp-objdir.c	…
tmp-objdir.h	…
trace.c	…
trace.h	…
trace2.c	hash-ll.h: split out of hash.h to remove dependency on repository.h	2023-04-24 12:47:32 -07:00
trace2.h	…
trailer.c	…
trailer.h	…
transport-helper.c	…
transport-internal.h	…
transport.c	Merge branch 'jk/protocol-cap-parse-fix'	2023-04-25 13:56:20 -07:00
transport.h	…
tree-diff.c	diff.h: reduce unnecessary includes	2023-04-24 12:47:33 -07:00
tree-walk.c	treewide: remove cache.h inclusion due to previous changes	2023-04-24 12:47:33 -07:00
tree-walk.h	hash-ll.h: split out of hash.h to remove dependency on repository.h	2023-04-24 12:47:32 -07:00
tree.c	treewide: remove cache.h inclusion due to previous changes	2023-04-24 12:47:33 -07:00
tree.h	cache,tree: move basic name compare functions from read-cache to tree	2023-04-24 12:47:32 -07:00
unicode-width.h	…
unimplemented.sh	…
unix-socket.c	…
unix-socket.h	…
unix-stream-server.c	…
unix-stream-server.h	…
unpack-trees.c	Merge branch 'en/header-split-cache-h-part-2'	2023-05-09 16:45:46 -07:00
unpack-trees.h	…
upload-pack.c	upload-pack: advertise capabilities when cloning empty repos	2023-05-17 13:22:46 -07:00
upload-pack.h	…
url.c	…
url.h	…
urlmatch.c	…
urlmatch.h	…
usage.c	…
userdiff.c	attr: teach "--attr-source=<tree>" global option to "git"	2023-05-06 14:34:09 -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	Merge branch 'en/header-split-cache-h-part-2'	2023-05-09 16:45:46 -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	…
walker.h	…
wildmatch.c	…
wildmatch.h	…
worktree.c	…
worktree.h	…
wrap-for-bin.sh	…
wrapper.c	treewide: remove cache.h inclusion due to previous changes	2023-04-24 12:47:33 -07:00
wrapper.h	…
write-or-die.c	…
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	commit.h: reduce unnecessary includes	2023-04-24 12:47:33 -07:00
wt-status.h	…
xdiff-interface.c	…
xdiff-interface.h	hash-ll.h: split out of hash.h to remove dependency on repository.h	2023-04-24 12:47:32 -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