A fork of Git containing Microsoft-specific patches.
Перейти к файлу
Patrick Steinhardt f79e18849b cat-file: add option '-Z' that delimits input and output with NUL
In db9d67f2e9 (builtin/cat-file.c: support NUL-delimited input with
`-z`, 2022-07-22), we have introduced a new mode to read the input via
NUL-delimited records instead of newline-delimited records. This allows
the user to query for revisions that have newlines in their path
component. While unusual, such queries are perfectly valid and thus it
is clear that we should be able to support them properly.

Unfortunately, the commit only changed the input to be NUL-delimited,
but didn't change the output at the same time. While this is fine for
queries that are processed successfully, it is less so for queries that
aren't. In the case of missing commits for example the result can become
entirely unparsable:

```
$ printf "7ce4f05bae8120d9fa258e854a8669f6ea9cb7b1 blob 10\n1234567890\n\n\commit000" |
    git cat-file --batch -z
7ce4f05bae blob 10
1234567890

commit missing
```

This is of course a crafted query that is intentionally gaming the
deficiency, but more benign queries that contain newlines would have
similar problems.

Ideally, we should have also changed the output to be NUL-delimited when
`-z` is specified to avoid this problem. As the input is NUL-delimited,
it is clear that the output in this case cannot ever contain NUL
characters by itself. Furthermore, Git does not allow NUL characters in
revisions anyway, further stressing the point that using NUL-delimited
output is safe. The only exception is of course the object data itself,
but as git-cat-file(1) prints the size of the object data clients should
read until that specified size has been consumed.

But even though `-z` has only been introduced a few releases ago in Git
v2.38.0, changing the output format retroactively to also NUL-delimit
output would be a backwards incompatible change. And while one could
make the argument that the output is inherently broken already, we need
to assume that there are existing users out there that use it just fine
given that revisions containing newlines are quite exotic.

Instead, introduce a new option `-Z` that switches to NUL-delimited
input and output. While this new option could arguably only switch the
output format to be NUL-delimited, the consequence would be that users
have to always specify both `-z` and `-Z` when the input may contain
newlines. On the other hand, if the user knows that there never will be
newlines in the input, they don't have to use either of those options.
There is thus no usecase that would warrant treating input and output
format separately, which is why we instead opt to "do the right thing"
and have `-Z` mean to NUL-terminate both formats.

The old `-z` option is marked as deprecated with a hint that its output
may become unparsable. It is thus hidden both from the synopsis as well
as the command's help output.

Co-authored-by: Toon Claes <toon@iotcl.com>
Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2023-06-12 13:23:46 -07:00
.github Sync with 2.36.6 2023-04-17 21:16:04 +02:00
Documentation cat-file: add option '-Z' that delimits input and output with NUL 2023-06-12 13:23:46 -07:00
block-sha1
builtin cat-file: add option '-Z' that delimits input and output with NUL 2023-06-12 13:23:46 -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 alloc.h: move ALLOC_GROW() functions from cache.h 2023-02-23 17:25:28 -08:00
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 treewide: ensure one of the appropriate headers is sourced first 2023-02-23 17:25:28 -08:00
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 cat-file: add option '-Z' that delimits input and output with NUL 2023-06-12 13:23:46 -07:00
templates send-email: export patch counters in validate environment 2023-04-14 10:41:15 -07:00
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 mailmap: change primary address for Emily Shaffer 2023-04-07 14:33:52 -07:00
.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: move absolute path functions from cache.h 2023-03-21 10:56:52 -07:00
abspath.h abspath.h: move absolute path functions from cache.h 2023-03-21 10:56:52 -07:00
aclocal.m4
add-interactive.c commit.h: reduce unnecessary includes 2023-04-24 12:47:33 -07:00
add-interactive.h
add-patch.c editor: move editor-related functions and declarations into common file 2023-04-11 08:52:10 -07:00
advice.c Merge branch 'fc/advice-diverged-history' 2023-03-19 15:03:13 -07:00
advice.h Merge branch 'fc/advice-diverged-history' 2023-03-19 15:03:13 -07:00
alias.c rebase -m: fix serialization of strategy options 2023-04-10 09:53:19 -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 alloc.h: move ALLOC_GROW() functions from cache.h 2023-02-23 17:25:28 -08:00
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 git-zlib: move declarations for git-zlib functions from cache.h 2023-04-11 08:52:10 -07:00
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 treewide: reduce includes of cache.h in other headers 2023-04-11 08:52:11 -07:00
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 treewide: remove cache.h inclusion due to object.h changes 2023-04-11 08:52:10 -07:00
bisect.h
blame.c Merge branch 'jk/blame-fake-commit-label' 2023-05-02 10:13:35 -07:00
blame.h object.h: stop depending on cache.h; make cache.h depend on object.h 2023-02-23 17:25:29 -08:00
blob.c object.h: stop depending on cache.h; make cache.h depend on object.h 2023-02-23 17:25:29 -08:00
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 branch: test for failures while renaming branches 2023-03-27 09:40:14 -07:00
builtin.h builtins: annotate always-empty prefix parameters 2023-03-28 14:11:24 -07:00
bulk-checkin.c treewide: remove double forward declaration of read_in_full 2023-04-11 08:52:11 -07:00
bulk-checkin.h treewide: remove unnecessary cache.h inclusion from a few headers 2023-03-21 10:56:50 -07:00
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 treewide: remove cache.h inclusion due to object.h changes 2023-04-11 08:52:10 -07:00
bundle.h treewide: remove unnecessary cache.h inclusion from a few headers 2023-03-21 10:56:50 -07:00
cache-tree.c object-file.h: move declarations for object-file.c functions from cache.h 2023-04-11 08:52:10 -07:00
cache-tree.h object.h: stop depending on cache.h; make cache.h depend on object.h 2023-02-23 17:25:29 -08:00
cache.h cache.h: remove unnecessary headers 2023-04-24 12:47:33 -07:00
cbtree.c treewide: ensure one of the appropriate headers is sourced first 2023-02-23 17:25:28 -08:00
cbtree.h treewide: remove unnecessary git-compat-util.h includes in headers 2023-02-23 17:25:28 -08:00
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 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 treewide: remove cache.h inclusion due to pager.h changes 2023-04-11 08:52:11 -07:00
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 Merge branch 'ds/ahead-behind' 2023-04-06 13:38:21 -07:00
commit-reach.c Merge branch 'ab/remove-implicit-use-of-the-repository' 2023-04-06 13:38:30 -07:00
commit-reach.h Merge branch 'ab/remove-implicit-use-of-the-repository' 2023-04-06 13:38:30 -07:00
commit-slab-decl.h
commit-slab-impl.h treewide: remove unnecessary git-compat-util.h includes in headers 2023-02-23 17:25:28 -08:00
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 Merge branch 'en/header-split-cache-h-part-2' 2023-05-09 16:45:46 -07:00
config.h Merge branch 'gc/config-parsing-cleanup' 2023-04-06 13:38:29 -07:00
config.mak.dev
config.mak.in
config.mak.uname Merge branch 'hj/remove-msys-support' 2023-02-09 14:40:47 -08:00
configure.ac
connect.c Merge branch 'jk/protocol-cap-parse-fix' 2023-04-25 13:56:20 -07:00
connect.h v0 protocol: use size_t for capability length/offset 2023-04-14 15:08:13 -07:00
connected.c Merge branch 'en/header-split-cleanup' 2023-04-06 13:38:31 -07:00
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 date: remove approxidate_relative() 2023-04-10 08:46:40 -07:00
decorate.c treewide: replace cache.h with more direct headers, where possible 2023-02-23 17:25:30 -08:00
decorate.h
delta-islands.c treewide: remove cache.h inclusion due to object.h changes 2023-04-11 08:52:10 -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 Merge branch 'en/header-split-cache-h-part-2' 2023-05-09 16:45:46 -07:00
diagnose.h treewide: remove unnecessary inclusions of parse-options.h from headers 2023-03-20 11:55:18 -07:00
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 object.h: stop depending on cache.h; make cache.h depend on object.h 2023-02-23 17:25:29 -08:00
diff-merges.h
diff-no-index.c treewide: remove cache.h inclusion due to object.h changes 2023-04-11 08:52:10 -07:00
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 cocci: apply the "promisor-remote.h" part of "the_repository.pending" 2023-03-28 07:36:46 -07:00
diffcore-delta.c object.h: stop depending on cache.h; make cache.h depend on object.h 2023-02-23 17:25:29 -08:00
diffcore-order.c treewide: replace cache.h with more direct headers, where possible 2023-02-23 17:25:30 -08:00
diffcore-pickaxe.c pretty.h: move has_non_ascii() declaration from commit.h 2023-02-23 17:25:29 -08:00
diffcore-rename.c Merge branch 'ab/remove-implicit-use-of-the-repository' 2023-04-06 13:38:30 -07:00
diffcore-rotate.c treewide: replace cache.h with more direct headers, where possible 2023-02-23 17:25:30 -08:00
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 Merge branch 'en/header-cleanup' 2023-03-17 14:03:09 -07:00
dir-iterator.h dir-iterator: drop unused `DIR_ITERATOR_FOLLOW_SYMLINKS` 2023-02-16 16:21:56 -08:00
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 editor: move editor-related functions and declarations into common file 2023-04-11 08:52:10 -07:00
entry.c symlinks.h: move declarations for symlinks.c functions from cache.h 2023-04-24 12:47:31 -07:00
entry.h treewide: remove unnecessary cache.h includes 2023-02-23 17:25:28 -08:00
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 treewide: remove cache.h inclusion due to object-name.h changes 2023-04-11 08:52:09 -07:00
fmt-merge-msg.h
fsck.c commit.h: reduce unnecessary includes 2023-04-24 12:47:33 -07:00
fsck.h object.h: stop depending on cache.h; make cache.h depend on object.h 2023-02-23 17:25:29 -08:00
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 alloc.h: move ALLOC_GROW() functions from cache.h 2023-02-23 17:25:28 -08:00
fsmonitor-settings.h
fsmonitor.c treewide: be explicit about dependence on trace.h & trace2.h 2023-04-11 08:52:08 -07:00
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 mergetool: new config guiDefault supports auto-toggling gui by DISPLAY 2023-04-05 21:03:29 -07:00
git-filter-branch.sh
git-instaweb.sh
git-merge-octopus.sh
git-merge-one-file.sh
git-merge-resolve.sh
git-mergetool--lib.sh mergetool: new config guiDefault supports auto-toggling gui by DISPLAY 2023-04-05 21:03:29 -07:00
git-mergetool.sh mergetool: new config guiDefault supports auto-toggling gui by DISPLAY 2023-04-05 21:03:29 -07:00
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: 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 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 gpg-interface: lazily initialize and read the configuration 2023-02-09 17:01:27 -08:00
graph.c treewide: replace cache.h with more direct headers, where possible 2023-02-23 17:25:30 -08:00
graph.h
grep.c Merge branch 'en/header-split-cache-h-part-2' 2023-05-09 16:45:46 -07:00
grep.h grep: work around UTF-8 related JIT bug in PCRE2 <= 10.34 2023-03-23 11:19:34 -07:00
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 treewide: remove unnecessary cache.h includes in source files 2023-02-23 17:25:28 -08:00
hashmap.h Merge branch 'en/header-split-cache-h-part-2' 2023-05-09 16:45:46 -07:00
help.c Merge branch 'jk/unused-post-2.39-part2' 2023-03-17 14:03:09 -07:00
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 hook API: support passing stdin to hooks, convert am's 'post-rewrite' 2023-02-08 12:50:03 -08:00
http-backend.c treewide: remove cache.h inclusion due to git-zlib changes 2023-04-11 08:52:10 -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 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 'en/header-split-cache-h' 2023-04-25 13:56:20 -07:00
http.h Sync with 2.30.9 2023-04-17 21:15:44 +02:00
ident.c ident.h: move ident-related declarations out of cache.h 2023-02-23 17:25:29 -08:00
ident.h ident.h: move ident-related declarations out of cache.h 2023-02-23 17:25:29 -08:00
imap-send.c imap-send: include strbuf.h 2023-05-17 09:54:07 -07:00
iterator.h
json-writer.c treewide: remove unnecessary cache.h includes in source files 2023-02-23 17:25:28 -08:00
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 treewide: remove unnecessary cache.h includes in source files 2023-02-23 17:25:28 -08:00
kwset.h
levenshtein.c treewide: remove unnecessary cache.h includes in source files 2023-02-23 17:25:28 -08:00
levenshtein.h
line-log.c diff.h: reduce unnecessary includes 2023-04-24 12:47:33 -07:00
line-log.h hash.h: move some oid-related declarations from cache.h 2023-02-23 17:25:28 -08:00
line-range.c
line-range.h
linear-assignment.c treewide: remove unnecessary cache.h includes in source files 2023-02-23 17:25:28 -08:00
linear-assignment.h
list-objects-filter-options.c Merge branch 'ab/remove-implicit-use-of-the-repository' 2023-04-06 13:38:30 -07:00
list-objects-filter-options.h Merge branch 'en/header-split-cleanup' 2023-04-06 13:38:31 -07:00
list-objects-filter.c treewide: remove cache.h inclusion due to object.h changes 2023-04-11 08:52:10 -07:00
list-objects-filter.h
list-objects.c treewide: remove cache.h inclusion due to object.h changes 2023-04-11 08:52:10 -07:00
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 treewide: remove unnecessary includes of cache.h 2023-03-21 10:56:53 -07:00
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 Merge branch 'jc/spell-id-in-both-caps-in-message-id' 2023-04-11 13:49:12 -07:00
mailinfo.h
mailmap.c Merge branch 'en/header-split-cache-h' 2023-04-25 13:56:20 -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 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 treewide: remove unnecessary cache.h includes in source files 2023-02-23 17:25:28 -08:00
mem-pool.h
merge-blobs.c Merge branch 'ab/remove-implicit-use-of-the-repository' 2023-04-06 13:38:30 -07:00
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 treewide: be explicit about dependence on trace.h & trace2.h 2023-04-11 08:52:08 -07:00
notes-cache.c commit.h: reduce unnecessary includes 2023-04-24 12:47:33 -07:00
notes-cache.h
notes-merge.c treewide: remove cache.h inclusion due to object-file.h changes 2023-04-11 08:52:10 -07:00
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-name.h: move declarations for object-name.c functions from cache.h 2023-04-11 08:52:09 -07:00
object-store.h Merge branch 'en/header-split-cache-h-part-2' 2023-05-09 16:45:46 -07:00
object.c object-file.h: move declarations for object-file.c functions from cache.h 2023-04-11 08:52:10 -07:00
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 alloc.h: move ALLOC_GROW() functions from cache.h 2023-02-23 17:25:28 -08: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 treewide: remove unnecessary cache.h includes 2023-02-23 17:25:28 -08:00
oidset.c hex.h: move some hex-related declarations from cache.h 2023-02-23 17:25:28 -08:00
oidset.h
oidtree.c treewide: ensure one of the appropriate headers is sourced first 2023-02-23 17:25:28 -08: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 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 treewide: remove cache.h inclusion due to object-file.h changes 2023-04-11 08:52:10 -07:00
pack-mtimes.c treewide: remove cache.h inclusion due to object-file.h changes 2023-04-11 08:52:10 -07:00
pack-mtimes.h treewide: remove unnecessary git-compat-util.h includes in headers 2023-02-23 17:25:28 -08:00
pack-objects.c alloc.h: move ALLOC_GROW() functions from cache.h 2023-02-23 17:25:28 -08:00
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 csum-file.h: remove unnecessary inclusion of cache.h 2023-03-21 10:56:55 -07:00
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 treewide: remove cache.h inclusion due to pager.h changes 2023-04-11 08:52:11 -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 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 treewide: remove unnecessary cache.h inclusion from several sources 2023-03-21 10:56:51 -07:00
patch-ids.h
path.c treewide: remove double forward declaration of read_in_full 2023-04-11 08:52:11 -07:00
path.h path.h: move function declarations for path.c functions from cache.h 2023-03-21 10:56:52 -07:00
pathspec.c Merge branch 'jc/attr-source-tree' 2023-05-17 10:11:41 -07:00
pathspec.h dir.h: refactor to no longer need to include cache.h 2023-02-23 17:25:29 -08:00
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 treewide: remove cache.h inclusion due to pager.h changes 2023-04-11 08:52:11 -07:00
pretty.h Merge branch 'ab/remove-implicit-use-of-the-repository' 2023-04-06 13:38:30 -07:00
prio-queue.c alloc.h: move ALLOC_GROW() functions from cache.h 2023-02-23 17:25:28 -08: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 treewide: remove unnecessary cache.h inclusion 2023-04-11 08:52:09 -07:00
promisor-remote.h cocci: apply the "promisor-remote.h" part of "the_repository.pending" 2023-03-28 07:36:46 -07:00
prompt.c treewide: remove cache.h inclusion due to environment.h changes 2023-03-21 10:56:54 -07:00
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 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 treewide: remove cache.h inclusion due to environment.h changes 2023-03-21 10:56:54 -07:00
prune-packed.h
quote.c treewide: reduce includes of cache.h in other headers 2023-04-11 08:52:11 -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 treewide: remove cache.h inclusion due to previous changes 2023-04-24 12:47:33 -07:00
range-diff.h
reachable.c treewide: remove cache.h inclusion due to environment.h changes 2023-03-21 10:56:54 -07:00
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 treewide: ensure one of the appropriate headers is sourced first 2023-02-23 17:25:28 -08:00
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 Merge branch 'ow/ref-format-remove-unused-member' 2023-04-06 13:38:32 -07:00
reflog-walk.c alloc.h: move ALLOC_GROW() functions from cache.h 2023-02-23 17:25:28 -08:00
reflog-walk.h treewide: remove unnecessary cache.h includes 2023-02-23 17:25:28 -08:00
reflog.c diff.h: reduce unnecessary includes 2023-04-24 12:47:33 -07:00
reflog.h
refs.c treewide: remove cache.h inclusion due to object-name.h changes 2023-04-11 08:52:09 -07:00
refs.h Merge branch 'en/header-split-cleanup' 2023-04-06 13:38:31 -07:00
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 Merge branch 'sg/parse-options-h-users' 2023-03-30 13:47:11 -07:00
replace-object.c treewide: remove unnecessary cache.h inclusion from several sources 2023-03-21 10:56:51 -07:00
replace-object.h replace-object.h: move read_replace_refs declaration from cache.h to here 2023-02-23 17:25:30 -08:00
repo-settings.c Merge branch 'tb/enable-cruft-packs-by-default' 2023-04-28 16:03:03 -07:00
repository.c treewide: be explicit about dependence on trace.h & trace2.h 2023-04-11 08:52:08 -07:00
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 Merge branch 'en/header-split-cleanup' 2023-04-06 13:38:31 -07:00
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 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 rebase -m: cleanup --strategy-option handling 2023-04-10 09:53:19 -07:00
serve.c Merge branch 'jk/unused-post-2.39-part2' 2023-03-17 14:03:09 -07:00
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 setup.h: move declarations for setup.c functions from cache.h 2023-03-21 10:56:54 -07:00
sh-i18n--envsubst.c
sha1dc_git.c treewide: replace cache.h with more direct headers, where possible 2023-02-23 17:25:30 -08:00
sha1dc_git.h
shallow.c treewide: be explicit about dependence on trace.h & trace2.h 2023-04-11 08:52:08 -07:00
shallow.h object.h: stop depending on cache.h; make cache.h depend on object.h 2023-02-23 17:25:29 -08:00
shared.mak
shell.c treewide: remove unnecessary cache.h includes in source files 2023-02-23 17:25:28 -08:00
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 alloc.h: move ALLOC_GROW() functions from cache.h 2023-02-23 17:25:28 -08:00
sigchain.h
simple-ipc.h
sparse-index.c environment.h: move declarations for environment.c functions from cache.h 2023-03-21 10:56:53 -07:00
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 dir.h: refactor to no longer need to include cache.h 2023-02-23 17:25:29 -08:00
strbuf.c strbuf: provide CRLF-aware helper to read until a specified delimiter 2023-06-12 13:23:24 -07:00
strbuf.h strbuf: provide CRLF-aware helper to read until a specified delimiter 2023-06-12 13:23:24 -07:00
streaming.c treewide: remove cache.h inclusion due to object-file.h changes 2023-04-11 08:52:10 -07:00
streaming.h treewide: remove unnecessary cache.h inclusion from a few headers 2023-03-21 10:56:50 -07:00
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 cache.h: remove dependence on hex.h; make other files include it explicitly 2023-02-23 17:25:29 -08:00
strvec.h
sub-process.c treewide: ensure one of the appropriate headers is sourced first 2023-02-23 17:25:28 -08:00
sub-process.h treewide: remove unnecessary git-compat-util.h includes in headers 2023-02-23 17:25:28 -08:00
submodule-config.c object-store.h: reduce unnecessary includes 2023-04-24 12:47:33 -07:00
submodule-config.h hash.h: move some oid-related declarations from cache.h 2023-02-23 17:25:28 -08:00
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 treewide: remove cache.h inclusion due to object.h changes 2023-04-11 08:52:10 -07:00
tag.h
tar.h
tempfile.c treewide: remove unnecessary includes of cache.h 2023-03-21 10:56:53 -07:00
tempfile.h
thread-utils.c treewide: remove unnecessary cache.h includes in source files 2023-02-23 17:25:28 -08:00
thread-utils.h
tmp-objdir.c treewide: remove cache.h inclusion due to object-file.h changes 2023-04-11 08:52:10 -07:00
tmp-objdir.h
trace.c treewide: remove unnecessary cache.h inclusion 2023-04-11 08:52:09 -07:00
trace.h Merge branch 'en/header-cleanup' 2023-03-17 14:03:09 -07:00
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 treewide: remove cache.h inclusion due to environment.h changes 2023-03-21 10:56:54 -07:00
trailer.h
transport-helper.c treewide: remove cache.h inclusion due to object-name.h changes 2023-04-11 08:52:09 -07:00
transport-internal.h
transport.c Merge branch 'jk/protocol-cap-parse-fix' 2023-04-25 13:56:20 -07:00
transport.h treewide: remove unnecessary cache.h inclusion from a few headers 2023-03-21 10:56:50 -07:00
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 unicode: update the width tables to Unicode 15 2023-03-30 13:06:12 -07:00
unimplemented.sh
unix-socket.c treewide: replace cache.h with more direct headers, where possible 2023-02-23 17:25:30 -08:00
unix-socket.h
unix-stream-server.c treewide: remove unnecessary cache.h includes in source files 2023-02-23 17:25:28 -08:00
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 treewide: be explicit about dependence on convert.h 2023-04-11 08:52:09 -07:00
upload-pack.c upload-pack: advertise capabilities when cloning empty repos 2023-05-17 13:22:46 -07:00
upload-pack.h
url.c treewide: replace cache.h with more direct headers, where possible 2023-02-23 17:25:30 -08:00
url.h
urlmatch.c treewide: replace cache.h with more direct headers, where possible 2023-02-23 17:25:30 -08:00
urlmatch.h
usage.c treewide: remove unnecessary includes of cache.h 2023-03-21 10:56:53 -07:00
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 treewide: remove cache.h inclusion due to object.h changes 2023-04-11 08:52:10 -07:00
walker.h
wildmatch.c Merge branch 'pw/wildmatch-fixes' 2023-04-04 14:28:27 -07:00
wildmatch.h wildmatch: hide internal return values 2023-03-20 10:58:53 -07:00
worktree.c treewide: remove cache.h inclusion due to setup.h changes 2023-03-21 10:56:54 -07:00
worktree.h Merge branch 'rj/avoid-switching-to-already-used-branch' 2023-03-19 15:03:11 -07:00
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 wrapper.h: move declarations for wrapper.c functions from cache.h 2023-03-21 10:56:53 -07:00
write-or-die.c write-or-die.h: move declarations for write-or-die.c functions from cache.h 2023-03-21 10:56:54 -07:00
write-or-die.h write-or-die.h: move declarations for write-or-die.c functions from cache.h 2023-03-21 10:56:54 -07:00
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 Merge branch 'en/header-split-cleanup' 2023-04-06 13:38:31 -07:00
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

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 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