development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-07-04 16:48:40 +00:00
Code Issues Projects Releases Wiki Activity
71,660 Commits 6 Branches 947 Tags 382 MiB
C 50%
Shell 38.8%
Perl 5.3%
Tcl 3.3%
Python 0.8%
Other 1.6%
795006fff4
Go to file
Patrick Steinhardt 795006fff4 pack-bitmap: gracefully handle missing BTMP chunks 
In 0fea6b73f1 (Merge branch 'tb/multi-pack-verbatim-reuse', 2024-01-12)
we have introduced multi-pack verbatim reuse of objects. This series has
introduced a new BTMP chunk, which encodes information about bitmapped
objects in the multi-pack index. Starting with dab60934e3 (pack-bitmap:
pass `bitmapped_pack` struct to pack-reuse functions, 2023-12-14) we use
this information to figure out objects which we can reuse from each of
the packfiles.

One thing that we glossed over though is backwards compatibility with
repositories that do not yet have BTMP chunks in their multi-pack index.
In that case, `nth_bitmapped_pack()` would return an error, which causes
us to emit a warning followed by another error message. These warnings
are visible to users that fetch from a repository:

```
$ git fetch
...
remote: error: MIDX does not contain the BTMP chunk
remote: warning: unable to load pack: 'pack-f6bb7bd71d345ea9fe604b60cab9ba9ece54ffbe.idx', disabling pack-reuse
remote: Enumerating objects: 40, done.
remote: Counting objects: 100% (40/40), done.
remote: Compressing objects: 100% (39/39), done.
remote: Total 40 (delta 5), reused 0 (delta 0), pack-reused 0 (from 0)
...
```

While the fetch succeeds the user is left wondering what they did wrong.
Furthermore, as visible both from the warning and from the reuse stats,
pack-reuse is completely disabled in such repositories.

What is quite interesting is that this issue can even be triggered in
case `pack.allowPackReuse=single` is set, which is the default value.
One could have expected that in this case we fall back to the old logic,
which is to use the preferred packfile without consulting BTMP chunks at
all. But either we fail with the above error in case they are missing,
or we use the first pack in the multi-pack-index. The former case
disables pack-reuse altogether, whereas the latter case may result in
reusing objects from a suboptimal packfile.

Fix this issue by partially reverting the logic back to what we had
before this patch series landed. Namely, in the case where we have no
BTMP chunks or when `pack.allowPackReuse=single` are set, we use the
preferred pack instead of consulting the BTMP chunks.

Helped-by: Taylor Blau <me@ttaylorr.com>
Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2024-04-15 10:42:00 -07:00
.github ci: upgrade to using macos-13 2023-11-03 18:52:02 +09:00
block-sha1
builtin pack-bitmap: enable reuse from all bitmapped packs 2023-12-14 14:38:09 -08:00
ci Merge branch 'js/ci-discard-prove-state' 2023-12-09 16:37:48 -08:00
compat Merge branch 'jk/fsmonitor-unused-parameter' 2023-09-29 09:04:14 -07:00
contrib Merge branch 'tz/send-email-negatable-options' 2023-12-09 16:37:51 -08:00
Documentation Documentation/config/pack.txt: fix broken AsciiDoc mark-up 2024-02-23 13:47:16 -08:00
ewah ewah: implement bitmap_is_empty() 2023-12-14 14:38:07 -08: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 perl: bump the required Perl version to 5.8.1 from 5.8.0 2023-11-17 07:26:32 +09:00
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 perl: bump the required Perl version to 5.8.1 from 5.8.0 2023-11-17 07:26:32 +09:00
po Merge branch 'l10n/zh-TW/2023-11-19' of github.com:l10n-tw/git-po 2023-11-20 07:57:09 +08:00
refs files-backend.c: avoid stat in 'loose_fill_ref_dir' 2023-10-09 15:53:14 -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 pack-bitmap: gracefully handle missing BTMP chunks 2024-04-15 10:42:00 -07: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 ci: run unit tests in CI 2023-11-10 08:15:32 +09:00
.clang-format clang-format: fix typo in comment 2023-11-01 12:24:19 +09:00
.editorconfig
.gitattributes
.gitignore gitignore: ignore clangd .cache directory 2023-08-04 10:56:51 -07:00
.gitlab-ci.yml ci: add support for GitLab CI 2023-11-09 18:56:10 +09:00
.gitmodules
.mailmap mailmap: change primary address for Derrick Stolee 2023-10-12 10:59:36 -07:00
.tsan-suppressions
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 'jc/attr-tree-config' 2023-10-30 07:09:55 +09:00
attr.h attr: add attr.tree for setting the treeish to read attributes from 2023-10-13 11:43:29 -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-graph: detect out-of-order BIDX offsets 2023-10-09 15:55:02 -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 branch: test for failures while renaming branches 2023-03-27 09:40:14 -07:00
builtin.h builtin.h: remove unneccessary includes 2023-06-21 13:39:54 -07:00
bulk-checkin.c Merge branch 'eb/limit-bulk-checkin-to-blobs' 2023-10-10 11:39:14 -07:00
bulk-checkin.h bulk-checkin: only support blobs in index_bulk_checkin 2023-09-26 10:17:56 -07:00
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 treewide: remove unnecessary cache.h inclusion from a few headers 2023-03-21 10:56:50 -07:00
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 chunk-format: drop pair_chunk_unsafe() 2023-10-09 15:55:02 -07:00
chunk-format.h chunk-format: drop pair_chunk_unsafe() 2023-10-09 15:55:02 -07:00
CODE_OF_CONDUCT.md
color.c hex-ll: separate out non-hash-algo functions 2023-09-29 15:14:56 -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 Merge branch 'jk/chunk-bounds-more' 2023-12-09 16:37:48 -08:00
commit-graph.h Merge branch 'ps/do-not-trust-commit-graph-blindly-for-existence' 2023-11-08 11:03:59 +09: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 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
commit-slab.h
commit.c commit: detect commits that exist in commit-graph but not in the ODB 2023-11-01 12:04:06 +09: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 'jc/attr-tree-config' 2023-10-30 07:09:55 +09:00
config.h parse: separate out parsing functions from config.h 2023-09-29 15:14:57 -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 global: convert trivial usages of test <expr> -a/-o <expr> 2023-11-11 09:21:00 +09: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
COPYING
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 daemon: free listen_addr before returning 2023-10-05 14:54:58 -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 decorate: add clear_decoration() function 2023-10-05 14:54:55 -07:00
decorate.h decorate: add clear_decoration() function 2023-10-05 14:54:55 -07:00
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 dir.[ch]: add 'follow_symlink' arg to 'get_dtype' 2023-10-09 15:53:13 -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 Merge branch 'js/diff-cached-fsmonitor-fix' into maint-2.42 2023-11-02 16:53:19 +09:00
diff-merges.c diff-merges: introduce '--dd' option 2023-10-09 12:47:29 -07:00
diff-merges.h
diff-no-index.c Merge branch 'pw/diff-no-index-from-named-pipes' into maint-2.42 2023-11-02 16:53:18 +09:00
diff.c Merge branch 'jk/diff-result-code-cleanup' into maint-2.42 2023-11-02 16:53:16 +09:00
diff.h diff --stat: set the width defaults in a helper function 2023-09-29 15:46:06 -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 attr: enable attr pathspec magic for git-add and git-stash 2023-11-04 17:00:27 +09:00
dir.h dir.[ch]: add 'follow_symlink' arg to 'get_dtype' 2023-10-09 15:53:13 -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 wrapper: reduce scope of remove_or_warn() 2023-09-29 15:14:56 -07:00
entry.h wrapper: reduce scope of remove_or_warn() 2023-09-29 15:14:56 -07:00
environment.c max_tree_depth: lower it for MSVC to avoid stack overflows 2023-11-02 08:58:28 +09: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' into maint-2.42 2023-11-02 16:53:16 +09: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 doc: fix some typos, grammar and wording issues 2023-10-05 12:55:38 -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 perl: bump the required Perl version to 5.8.1 from 5.8.0 2023-11-17 07:26:32 +09:00
git-compat-util.h git-compat-util.h: implement checked size_t to uint32_t conversion 2023-12-14 14:38:08 -08:00
git-curl-compat.h
git-cvsexportcommit.perl perl: bump the required Perl version to 5.8.1 from 5.8.0 2023-11-17 07:26:32 +09:00
git-cvsimport.perl perl: bump the required Perl version to 5.8.1 from 5.8.0 2023-11-17 07:26:32 +09:00
git-cvsserver.perl perl: bump the required Perl version to 5.8.1 from 5.8.0 2023-11-17 07:26:32 +09:00
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 merge-one-file: compute empty blob object ID 2018-05-02 13:59:53 +09:00
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-p4 shouldn't attempt to store symlinks in LFS 2023-10-19 10:57:44 -07:00
git-quiltimport.sh
git-request-pull.sh
git-send-email.perl Merge branch 'tz/send-email-negatable-options' 2023-12-09 16:37:51 -08:00
git-sh-i18n.sh
git-sh-setup.sh
git-submodule.sh
git-svn.perl Merge branch 'tz/send-email-negatable-options' 2023-12-09 16:37:51 -08:00
GIT-VERSION-GEN Start the 2.44 cycle 2023-12-09 16:37:51 -08: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-ll.c hex-ll: separate out non-hash-algo functions 2023-09-29 15:14:56 -07:00
hex-ll.h hex-ll: separate out non-hash-algo functions 2023-09-29 15:14:56 -07:00
hex.c hex-ll: separate out non-hash-algo functions 2023-09-29 15:14:56 -07:00
hex.h hex-ll: separate out non-hash-algo functions 2023-09-29 15:14:56 -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' into maint-2.42 2023-11-02 16:53:19 +09: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
INSTALL perl: bump the required Perl version to 5.8.1 from 5.8.0 2023-11-17 07:26:32 +09: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
LGPL-2.1
line-log.c revision: clear decoration structs during release_revisions() 2023-10-05 14:54:57 -07:00
line-log.h revision: clear decoration structs during release_revisions() 2023-10-05 14:54:57 -07:00
line-range.c
line-range.h line-range.c: remove implicit dependency on the_index 2018-09-21 09:51:18 -07:00
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 Merge branch 'tb/rev-list-unpacked-fix' 2023-11-08 15:04:42 +09:00
list-objects.h
list.h
lockfile.c treewide: remove unnecessary includes of cache.h 2023-03-21 10:56:53 -07:00
lockfile.h *.[ch] *_INIT macros: use { 0 } for a "zero out" idiom 2021-09-27 14:47:59 -07:00
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 hex-ll: separate out non-hash-algo functions 2023-09-29 15:14:56 -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
Makefile Merge branch 'ps/ban-a-or-o-operator-with-test' 2023-12-09 16:37:50 -08: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 branch 'wx/merge-ort-comment-typofix' into maint-2.42 2023-11-02 16:53:27 +09: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: introduce {copy|clear}_merge_options() 2023-10-11 13:37:47 -07:00
merge-recursive.h merge: introduce {copy|clear}_merge_options() 2023-10-11 13:37:47 -07:00
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 pack-bitmap: gracefully handle missing BTMP chunks 2024-04-15 10:42:00 -07:00
midx.h midx: implement midx_preferred_pack() 2023-12-14 14:38:08 -08:00
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 bulk-checkin: only support blobs in index_bulk_checkin 2023-09-26 10:17:56 -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 pack-bitmap-write: deep-clear the bb_commit slab 2023-12-14 14:38:07 -08:00
pack-bitmap.c pack-bitmap: gracefully handle missing BTMP chunks 2024-04-15 10:42:00 -07:00
pack-bitmap.h pack-bitmap: enable reuse from all bitmapped packs 2023-12-14 14:38:09 -08: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 pack-objects: free packing_data in more places 2023-12-14 14:38:07 -08:00
pack-objects.h pack-objects: free packing_data in more places 2023-12-14 14:38:07 -08:00
pack-revindex.c pack-revindex: implement midx_pair_to_pack_pos() 2023-12-14 14:38:08 -08:00
pack-revindex.h pack-revindex: implement midx_pair_to_pack_pos() 2023-12-14 14:38:08 -08:00
pack-write.c treewide: remove unnecessary includes for wrapper.h 2023-07-05 11:41:59 -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 '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: make CMDMODE errors more precise 2023-10-29 09:15:18 +09:00
parse-options.h parse-options: make CMDMODE errors more precise 2023-10-29 09:15:18 +09:00
parse.c parse: separate out parsing functions from config.h 2023-09-29 15:14:57 -07:00
parse.h parse: separate out parsing functions from config.h 2023-09-29 15:14:57 -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 attr: enable attr pathspec magic for git-add and git-stash 2023-11-04 17:00:27 +09: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 parse: separate out parsing functions from config.h 2023-09-29 15:14:57 -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: fix ref filtering for %(decorate) formats 2023-10-09 11:25:13 -07:00
pretty.h Merge branch 'ab/remove-implicit-use-of-the-repository' 2023-04-06 13:38:30 -07:00
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 parse: separate out parsing functions from config.h 2023-09-29 15:14:57 -07:00
progress.h
promisor-remote.c Merge branch 'gc/config-context' 2023-07-06 11:54:48 -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 parse: separate out parsing functions from config.h 2023-09-29 15:14:57 -07:00
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
README.md
rebase-interactive.c Merge branch 'cw/compat-util-header-cleanup' 2023-07-17 11:30:42 -07:00
rebase-interactive.h
rebase.c parse: separate out parsing functions from config.h 2023-09-29 15:14:57 -07:00
rebase.h
ref-filter.c Merge branch 'vd/for-each-ref-unsorted-optimization' 2023-12-09 16:37:50 -08:00
ref-filter.h ref-filter.h: add functions for filter/format & format-only 2023-11-16 14:02:59 +09: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
RelNotes Start the 2.44 cycle 2023-12-09 16:37:51 -08:00
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 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 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 rev-list: add commit object support in --missing option 2023-11-01 12:07:18 +09:00
revision.h rev-list: add commit object support in --missing option 2023-11-01 12:07:18 +09: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' into maint-2.42 2023-11-02 16:53:15 +09:00
SECURITY.md
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' into maint-2.42 2023-11-02 16:53:24 +09: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 setup: fix leaking repository format 2023-11-07 08:51:41 +09:00
setup.h Merge branch 'ds/scalar-updates' into maint-2.42 2023-11-02 16:53:15 +09:00
sh-i18n--envsubst.c
sha1dc_git.c
sha1dc_git.h
shallow.c shallow: fix memory leak when registering shallow roots 2023-11-07 08:51:41 +09: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 Prevent git from rehashing 4GiB files 2023-10-13 13:33:35 -07:00
statinfo.h Merge branch 'en/header-split-cache-h-part-3' 2023-06-29 16:43:21 -07:00
strbuf.c hex-ll: separate out non-hash-algo functions 2023-09-29 15:14:56 -07:00
strbuf.h doc: fix some typos, grammar and wording issues 2023-10-05 12:55:38 -07:00
streaming.c treewide: remove unnecessary includes for wrapper.h 2023-07-05 11:41:59 -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 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 strvec: drop unnecessary include of hex.h 2023-11-03 08:26:55 +09: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 Merge branch 'en/header-cleanup' 2023-03-17 14:03:09 -07:00
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 treewide: remove unnecessary cache.h inclusion from a few headers 2023-03-21 10:56:50 -07:00
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 unicode: update the width tables to Unicode 15.1 2023-09-25 16:17:28 -07:00
unimplemented.sh
unix-socket.c
unix-socket.h
unix-stream-server.c
unix-stream-server.h
unpack-trees.c Merge branch 'cw/prelim-cleanup' 2023-10-10 11:39:14 -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' into maint-2.42 2023-11-02 16:53:20 +09:00
upload-pack.h
url.c hex-ll: separate out non-hash-algo functions 2023-09-29 15:14:56 -07:00
url.h
urlmatch.c hex-ll: separate out non-hash-algo functions 2023-09-29 15:14:56 -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 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 worktree: mark unused parameters in noop repair callback 2023-08-29 17:56:25 -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 parse: separate out parsing functions from config.h 2023-09-29 15:14:57 -07:00
wrapper.h wrapper: reduce scope of remove_or_warn() 2023-09-29 15:14:56 -07:00
write-or-die.c parse: separate out parsing functions from config.h 2023-09-29 15:14:57 -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 Merge branch 'jk/diff-result-code-cleanup' into maint-2.42 2023-11-02 16:53:16 +09: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

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