Go to file
Taylor Blau cd846bacc7 pack-objects: introduce '--stdin-packs=follow'
When invoked with '--stdin-packs', pack-objects will generate a pack
which contains the objects found in the "included" packs, less any
objects from "excluded" packs.

Packs that exist in the repository but weren't specified as either
included or excluded are in practice treated like the latter, at least
in the sense that pack-objects won't include objects from those packs.
This behavior forces us to include any cruft pack(s) in a repository's
multi-pack index for the reasons described in ddee3703b3
(builtin/repack.c: add cruft packs to MIDX during geometric repack,
2022-05-20).

The full details are in ddee3703b3, but the gist is if you
have a once-unreachable object in a cruft pack which later becomes
reachable via one or more commits in a pack generated with
'--stdin-packs', you *have* to include that object in the MIDX via the
copy in the cruft pack, otherwise we cannot generate reachability
bitmaps for any commits which reach that object.

Note that the traversal here is best-effort, similar to the existing
traversal which provides name-hash hints. This means that the object
traversal may hand us back a blob that does not actually exist. We
*won't* see missing trees/commits with 'ignore_missing_links' because:

 - missing commit parents are discarded at the commit traversal stage by
   revision.c::process_parents()

 - missing tag objects are discarded by revision.c::handle_commit()

 - missing tree objects are discarded by the list-objects code in
   list-objects.c::process_tree()

But we have to handle potentially-missing blobs specially by making a
separate check to ensure they exist in the repository. Failing to do so
would mean that we'd add an object to the packing list which doesn't
actually exist, rendering us unable to write out the pack.

This prepares us for new repacking behavior which will "resurrect"
objects found in cruft or otherwise unspecified packs when generating
new packs. In the context of geometric repacking, this may be used to
maintain a sequence of geometrically-repacked packs, the union of which
is closed under reachability, even in the case described earlier.

Signed-off-by: Taylor Blau <me@ttaylorr.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2025-06-23 15:41:37 -07:00
.github Merge branch 'js/github-ci-win-coverity-fix' 2025-06-13 13:29:15 -07:00
Documentation pack-objects: introduce '--stdin-packs=follow' 2025-06-23 15:41:37 -07:00
bin-wrappers
block-sha1
builtin pack-objects: introduce '--stdin-packs=follow' 2025-06-23 15:41:37 -07:00
ci Merge branch 'js/ci-buildsystems-cleanup' 2025-05-13 14:05:06 -07:00
compat Merge branch 'ss/revert-builtin-bswap-stuff' 2025-06-13 13:29:14 -07:00
compiler-tricks intialize false_but_the_compiler_does_not_know_it_ 2025-05-07 09:11:47 -07:00
contrib meson: introduce kwargs variable for tests 2025-06-02 07:51:43 -07:00
ewah
git-gui Merge branch 'master' of https://github.com/j6t/git-gui 2025-06-06 09:41:59 -07:00
gitk-git Merge branch 'master' of https://github.com/j6t/gitk 2025-05-29 09:02:14 -07:00
gitweb
mergetools
negotiator
oss-fuzz
perl Merge branch 'rj/build-tweaks-part2' 2025-05-27 13:59:09 -07:00
po l10n: zh_TW: update translation for Git 2.50 2025-06-12 22:29:32 +08:00
refs Merge branch 'sj/ref-contents-check-fix' 2025-06-03 08:55:23 -07:00
reftable reftable: make REFTABLE_UNUSED C99 compatible 2025-05-29 09:18:53 -07:00
sha1
sha1collisiondetection@855827c583
sha1dc
sha256
subprojects
t pack-objects: introduce '--stdin-packs=follow' 2025-06-23 15:41:37 -07:00
templates
trace2 trace2: avoid "futile conditional" 2025-05-15 13:46:47 -07:00
xdiff xdiff: disable cleanup_records heuristic with --minimal 2025-04-29 12:46:58 -07:00
.cirrus.yml
.clang-format
.editorconfig
.gitattributes git-gui: wire up support for the Meson build system 2025-05-13 08:48:09 +02:00
.gitignore git-gui: replace GIT-GUI-VARS with GIT-GUI-BUILD-OPTIONS 2025-05-13 08:27:09 +02:00
.gitlab-ci.yml Merge branch 'ps/ci-gitlab-enable-msvc-meson-job' 2025-05-23 15:34:08 -07:00
.gitmodules
.mailmap
.tsan-suppressions
CODE_OF_CONDUCT.md
COPYING
GIT-BUILD-OPTIONS.in
GIT-VERSION-FILE.in
GIT-VERSION-GEN Start 2.51 cycle, the first batch 2025-06-17 10:44:42 -07:00
INSTALL
LGPL-2.1
Makefile Merge branch 'jk/no-funny-object-types' 2025-05-27 13:59:08 -07:00
README.md
RelNotes Start 2.51 cycle, the first batch 2025-06-17 10:44:42 -07:00
SECURITY.md
abspath.c
abspath.h
aclocal.m4
add-interactive.c
add-interactive.h
add-patch.c
advice.c
advice.h
alias.c
alias.h
alloc.c
alloc.h
apply.c apply: set file mode when --reverse creates a deleted file 2025-05-27 06:48:07 -07:00
apply.h
archive-tar.c
archive-zip.c
archive.c Merge branch 'ps/parse-options-integers' 2025-04-24 17:25:34 -07:00
archive.h
attr.c
attr.h
banned.h
base85.c
base85.h
bisect.c
bisect.h
blame.c
blame.h
blob.c
blob.h
bloom.c
bloom.h
branch.c
branch.h
builtin.h
bulk-checkin.c treewide: convert users of `repo_has_object_file()` to `has_object()` 2025-04-29 10:08:13 -07:00
bulk-checkin.h
bundle-uri.c Merge branch 'js/misc-fixes' 2025-05-27 13:59:11 -07:00
bundle-uri.h
bundle.c
bundle.h
cache-tree.c treewide: convert users of `repo_has_object_file()` to `has_object()` 2025-04-29 10:08:13 -07:00
cache-tree.h
cbtree.c
cbtree.h
chdir-notify.c
chdir-notify.h
check-builtins.sh
checkout.c
checkout.h
chunk-format.c
chunk-format.h
color.c
color.h
column.c
column.h
combine-diff.c
command-list.txt
commit-graph.c Merge branch 'js/misc-fixes' 2025-05-27 13:59:11 -07:00
commit-graph.h
commit-reach.c
commit-reach.h
commit-slab-decl.h
commit-slab-impl.h
commit-slab.h
commit.c
commit.h
common-exit.c
common-init.c
common-init.h
common-main.c
config.c
config.h
config.mak.dev
config.mak.in
config.mak.uname Merge branch 'bs/config-mak-openbsd' 2025-06-04 14:30:28 -07:00
configure.ac configure.ac: upgrade to a compilation check for sysinfo 2025-05-19 11:34:00 -07:00
connect.c
connect.h
connected.c
connected.h
convert.c object-store: move function declarations to their respective subsystems 2025-04-29 10:08:12 -07:00
convert.h
copy.c
copy.h
credential.c
credential.h
csum-file.c
csum-file.h
ctype.c
daemon.c
date.c
date.h
decorate.c
decorate.h
delta-islands.c
delta-islands.h
delta.h
detect-compiler
diagnose.c
diagnose.h
diff-delta.c
diff-lib.c
diff-merges.c
diff-merges.h
diff-no-index.c diff --no-index: support limiting by pathspec 2025-05-22 14:20:11 -07:00
diff.c Merge branch 'js/diff-codeql-false-positive-workaround' 2025-05-08 12:36:32 -07:00
diff.h
diffcore-break.c
diffcore-delta.c
diffcore-order.c
diffcore-pickaxe.c
diffcore-rename.c object-store: move function declarations to their respective subsystems 2025-04-29 10:08:12 -07:00
diffcore-rotate.c
diffcore.h
dir-iterator.c
dir-iterator.h
dir.c pathspec: add flag to indicate operation without repository 2025-05-22 14:20:11 -07:00
dir.h
editor.c
editor.h
entry.c
entry.h
environment.c Merge branch 'js/windows-arm64' 2025-05-05 14:56:24 -07:00
environment.h
exec-cmd.c
exec-cmd.h
fetch-negotiator.c
fetch-negotiator.h
fetch-pack.c treewide: convert users of `repo_has_object_file()` to `has_object()` 2025-04-29 10:08:13 -07:00
fetch-pack.h
fmt-merge-msg.c
fmt-merge-msg.h
fsck.c
fsck.h packed-backend: fsck should warn when "packed-refs" file is empty 2025-05-14 12:32:58 -07:00
fsmonitor--daemon.h
fsmonitor-ipc.c
fsmonitor-ipc.h
fsmonitor-ll.h
fsmonitor-path-utils.h
fsmonitor-settings.c
fsmonitor-settings.h
fsmonitor.c
fsmonitor.h
generate-cmdlist.sh
generate-configlist.sh Merge branch 'jc/sed-build-fixes' 2025-06-13 13:29:14 -07:00
generate-hooklist.sh
generate-perl.sh
generate-python.sh
generate-script.sh
gettext.c
gettext.h
git-archimport.perl
git-compat-util.h midx repack: avoid integer overflow on 32 bit systems 2025-05-22 14:48:36 -07:00
git-curl-compat.h
git-cvsexportcommit.perl
git-cvsimport.perl
git-cvsserver.perl cvsserver: remove unused escapeRefName function 2025-05-27 08:25:08 -07:00
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 'ag/send-email-hostname-f' 2025-05-23 15:34:08 -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
git.rc.in
gpg-interface.c
gpg-interface.h
graph.c
graph.h
grep.c
grep.h
hash-lookup.c
hash-lookup.h
hash.c
hash.h
hashmap.c Merge branch 'en/hashmap-clear-fix' 2025-05-08 12:36:31 -07:00
hashmap.h
help.c Avoid redundant conditions 2025-05-15 13:46:47 -07:00
help.h
hex-ll.c
hex-ll.h
hex.c
hex.h
hook.c
hook.h
http-backend.c
http-fetch.c
http-push.c curl: pass `long` values where expected 2025-06-06 08:12:24 -07:00
http-walker.c treewide: convert users of `repo_has_object_file()` to `has_object()` 2025-04-29 10:08:13 -07:00
http.c curl: pass `long` values where expected 2025-06-06 08:12:24 -07:00
http.h
ident.c
ident.h
imap-send.c curl: fix integer variable typechecks with curl_easy_setopt() 2025-06-04 14:17:53 -07:00
iterator.h
json-writer.c json-writer: add docstrings to jw_* functions 2025-05-16 09:33:06 -07:00
json-writer.h json-writer: describe the usage of jw_* functions 2025-05-16 09:33:07 -07:00
khash.h
kwset.c
kwset.h
levenshtein.c
levenshtein.h
line-log.c
line-log.h
line-range.c
line-range.h
linear-assignment.c
linear-assignment.h
list-objects-filter-options.c
list-objects-filter-options.h
list-objects-filter.c oidmap: rename oidmap_free() to oidmap_clear() 2025-05-12 13:06:26 -07:00
list-objects-filter.h
list-objects.c treewide: convert users of `repo_has_object_file()` to `has_object()` 2025-04-29 10:08:13 -07:00
list-objects.h
list.h
lockfile.c
lockfile.h
log-tree.c object-store: move function declarations to their respective subsystems 2025-04-29 10:08:12 -07:00
log-tree.h
loose.c
loose.h
ls-refs.c
ls-refs.h
mailinfo.c mailinfo: fix pointential memory leak if `decode_header` failed 2025-05-15 13:50:18 -07:00
mailinfo.h
mailmap.c
mailmap.h
match-trees.c
match-trees.h
mem-pool.c
mem-pool.h
merge-blobs.c
merge-blobs.h
merge-ll.c
merge-ll.h
merge-ort-wrappers.c
merge-ort-wrappers.h
merge-ort.c merge-ort: add a new mergeability_only option 2025-05-16 15:09:14 -07:00
merge-ort.h merge-ort: add a new mergeability_only option 2025-05-16 15:09:14 -07:00
merge.c
merge.h
mergesort.h
meson.build Merge branch 'ps/meson-tap-parse' 2025-06-17 10:44:42 -07:00
meson_options.txt Merge branch 'rj/build-tweaks-part2' 2025-05-27 13:59:09 -07:00
midx-write.c midx: avoid negative array index 2025-05-22 14:48:37 -07:00
midx.c midx: stop repeatedly looking up nonexistent packfiles 2025-05-28 07:56:29 -07:00
midx.h
name-hash.c name-hash: don't add sparse directories in threaded lazy init 2025-05-21 14:51:08 -07:00
name-hash.h
notes-cache.c
notes-cache.h
notes-merge.c
notes-merge.h
notes-utils.c
notes-utils.h
notes.c treewide: convert users of `repo_has_object_file()` to `has_object()` 2025-04-29 10:08:13 -07:00
notes.h
object-file-convert.c
object-file-convert.h
object-file.c object-file: drop support for writing objects with unknown types 2025-05-16 09:43:12 -07:00
object-file.h object-file: drop support for writing objects with unknown types 2025-05-16 09:43:12 -07:00
object-name.c object-store: move function declarations to their respective subsystems 2025-04-29 10:08:12 -07:00
object-name.h
object-store.c Merge branch 'jk/no-funny-object-types' 2025-05-27 13:59:08 -07:00
object-store.h Merge branch 'jk/no-funny-object-types' 2025-05-27 13:59:08 -07:00
object.c
object.h
oid-array.c
oid-array.h
oidmap.c oidmap: rename oidmap_free() to oidmap_clear() 2025-05-12 13:06:26 -07:00
oidmap.h oidmap: add size function 2025-05-12 13:06:26 -07:00
oidset.c
oidset.h
oidtree.c
oidtree.h
pack-bitmap-write.c Merge branch 'ly/do-not-localize-bug-messages' 2025-06-17 10:44:40 -07:00
pack-bitmap.c pack-bitmap: fix memory leak if `load_bitmap_entries_v1` failed 2025-05-12 10:58:35 -07:00
pack-bitmap.h
pack-check.c
pack-mtimes.c
pack-mtimes.h
pack-objects.c
pack-objects.h Merge branch 'ds/path-walk-2' 2025-06-17 10:44:38 -07:00
pack-revindex.c
pack-revindex.h
pack-write.c
pack.h
packfile.c Merge branch 'ps/midx-negative-packfile-cache' 2025-05-30 11:59:18 -07:00
packfile.h object-store: move function declarations to their respective subsystems 2025-04-29 10:08:12 -07:00
pager.c
pager.h
parallel-checkout.c
parallel-checkout.h
parse-options-cb.c
parse-options.c
parse-options.h
parse.c
parse.h
patch-delta.c
patch-ids.c
patch-ids.h
path-walk.c path-walk: add new 'edge_aggressive' option 2025-05-16 12:15:40 -07:00
path-walk.h path-walk: add new 'edge_aggressive' option 2025-05-16 12:15:40 -07:00
path.c object-store: move and rename `odb_pack_keep()` 2025-04-29 10:08:12 -07:00
path.h object-store: move and rename `odb_pack_keep()` 2025-04-29 10:08:12 -07:00
pathspec.c pathspec: add flag to indicate operation without repository 2025-05-22 14:20:11 -07:00
pathspec.h pathspec: add flag to indicate operation without repository 2025-05-22 14:20:11 -07:00
pkt-line.c
pkt-line.h
preload-index.c
preload-index.h
pretty.c
pretty.h
prio-queue.c
prio-queue.h
progress.c
progress.h
promisor-remote.c
promisor-remote.h
prompt.c
prompt.h
protocol-caps.c
protocol-caps.h
protocol.c
protocol.h
prune-packed.c object-store: move function declarations to their respective subsystems 2025-04-29 10:08:12 -07:00
prune-packed.h
pseudo-merge.c
pseudo-merge.h
quote.c
quote.h
range-diff.c
range-diff.h
reachable.c object-store: move function declarations to their respective subsystems 2025-04-29 10:08:12 -07:00
reachable.h
read-cache-ll.h
read-cache.c has_dir_name(): make code more obvious 2025-05-15 13:46:46 -07:00
read-cache.h
rebase-interactive.c
rebase-interactive.h
rebase.c
rebase.h
ref-filter.c
ref-filter.h
reflog-walk.c
reflog-walk.h
reflog.c treewide: convert users of `repo_has_object_file()` to `has_object()` 2025-04-29 10:08:13 -07:00
reflog.h
refs.c treewide: convert users of `repo_has_object_file()` to `has_object()` 2025-04-29 10:08:13 -07:00
refs.h
refspec.c
refspec.h
remote-curl.c curl: pass `long` values where expected 2025-06-06 08:12:24 -07:00
remote.c treewide: convert users of `repo_has_object_file()` to `has_object()` 2025-04-29 10:08:13 -07:00
remote.h
replace-object.c raw_object_store: drop extra pointer to replace_map 2025-05-12 13:06:27 -07:00
replace-object.h raw_object_store: drop extra pointer to replace_map 2025-05-12 13:06:27 -07:00
repo-settings.c Merge branch 'ds/path-walk-2' 2025-06-17 10:44:38 -07:00
repo-settings.h Merge branch 'ds/path-walk-2' 2025-06-17 10:44:38 -07:00
repository.c
repository.h
rerere.c
rerere.h
reset.c
reset.h
resolve-undo.c
resolve-undo.h
revision.c
revision.h Merge branch 'lo/remove-log-reencode-from-rev-info' 2025-04-29 14:21:31 -07:00
run-command.c
run-command.h
sane-ctype.h
scalar.c Merge branch 'ds/path-walk-2' 2025-06-17 10:44:38 -07:00
send-pack.c treewide: convert users of `repo_has_object_file()` to `has_object()` 2025-04-29 10:08:13 -07:00
send-pack.h
sequencer.c sequencer: replace error() with BUG() in update_squash_messages () 2025-06-03 08:33:01 -07:00
sequencer.h
serve.c
serve.h
server-info.c
server-info.h
setup.c
setup.h
sh-i18n--envsubst.c
sha1dc_git.c
sha1dc_git.h
shallow.c treewide: convert users of `repo_has_object_file()` to `has_object()` 2025-04-29 10:08:13 -07:00
shallow.h
shared.mak
shell.c
shortlog.h
sideband.c
sideband.h
sigchain.c
sigchain.h
simple-ipc.h
sparse-index.c
sparse-index.h
split-index.c
split-index.h
stable-qsort.c
statinfo.c
statinfo.h
strbuf.c
strbuf.h
streaming.c object-file: drop OBJECT_INFO_ALLOW_UNKNOWN_TYPE flag 2025-05-16 09:43:10 -07:00
streaming.h
string-list.c
string-list.h
strmap.c
strmap.h
strvec.c
strvec.h
sub-process.c
sub-process.h
submodule-config.c
submodule-config.h
submodule.c
submodule.h
symlinks.c
symlinks.h
tag.c
tag.h
tar.h
tempfile.c
tempfile.h
thread-utils.c thread-utils.c: detect online CPU count on OpenBSD / NetBSD 2025-06-01 17:15:13 -07:00
thread-utils.h
tmp-objdir.c
tmp-objdir.h
trace.c
trace.h
trace2.c
trace2.h
trailer.c
trailer.h
transport-helper.c Avoid redundant conditions 2025-05-15 13:46:47 -07:00
transport-internal.h
transport.c
transport.h
tree-diff.c
tree-walk.c
tree-walk.h tree-walk.h: fix incorrect API comment 2025-05-02 12:44:04 -07:00
tree.c
tree.h
unicode-width.h
unimplemented.sh
unix-socket.c
unix-socket.h
unix-stream-server.c
unix-stream-server.h
unpack-trees.c
unpack-trees.h
upload-pack.c upload-pack: rename `enum` to reflect the operation 2025-05-15 13:46:46 -07:00
upload-pack.h
url.c
url.h
urlmatch.c
urlmatch.h
usage.c
userdiff.c userdiff: add support for R programming language 2025-05-29 15:29:37 -07:00
userdiff.h
utf8.c
utf8.h
varint.c
varint.h
version-def.h.in
version.c
version.h
versioncmp.c
versioncmp.h
walker.c treewide: convert users of `repo_has_object_file()` to `has_object()` 2025-04-29 10:08:13 -07:00
walker.h
wildmatch.c
wildmatch.h
worktree.c
worktree.h
wrapper.c Merge branch 'cf/wrapper-bsd-eloop' 2025-05-15 17:24:55 -07:00
wrapper.h
write-or-die.c
write-or-die.h
ws.c
ws.h
wt-status.c
wt-status.h
xdiff-interface.c
xdiff-interface.h

README.md

Build status

Git - fast, scalable, distributed revision control system

Git is a fast, scalable, distributed revision control system with an unusually rich command set that provides both high-level operations and full access to internals.

Git is an Open Source project covered by the GNU General Public License version 2 (some parts of it are under different licenses, compatible with the GPLv2). It was originally written by Linus Torvalds with help of a group of hackers around the net.

Please read the file INSTALL for installation instructions.

Many Git online resources are accessible from https://git-scm.com/ including full documentation and Git related tools.

See Documentation/gittutorial.adoc to get started, then see Documentation/giteveryday.adoc for a useful minimum set of commands, and Documentation/git-<commandname>.adoc 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.adoc (man gitcvs-migration or git help cvs-migration if git is installed).

The user discussion and development of Git take place on the Git mailing list -- everyone is welcome to post bug reports, feature requests, comments and patches to git@vger.kernel.org (read Documentation/SubmittingPatches for instructions on patch submission and Documentation/CodingGuidelines).

Those wishing to help with error message, usage and informational message string translations (localization l10) should see po/README.md (a po file is a Portable Object file that holds the translations).

To subscribe to the list, send an email to git+subscribe@vger.kernel.org (see https://subspace.kernel.org/subscribing.html for details). The mailing list archives are available at https://lore.kernel.org/git/, https://marc.info/?l=git and other archival sites.

Issues which are security relevant should be disclosed privately to the Git Security mailing list git-security@googlegroups.com.

The maintainer frequently sends the "What's cooking" reports that list the current status of various development topics to the mailing list. The discussion following them give a good reference for project status, development direction and remaining tasks.

The name "git" was given by Linus Torvalds when he wrote the very first version. He described the tool as "the stupid content tracker" and the name as (depending on your mood):

  • random three-letter combination that is pronounceable, and not actually used by any common UNIX command. The fact that it is a mispronunciation of "get" may or may not be relevant.
  • stupid. contemptible and despicable. simple. Take your pick from the dictionary of slang.
  • "global information tracker": you're in a good mood, and it actually works for you. Angels sing, and a light suddenly fills the room.
  • "goddamn idiotic truckload of sh*t": when it breaks