Go to file
Taylor Blau 08f612ba70 builtin/pack-objects.c: freshen objects from existing cruft packs
Once an object is written into a cruft pack, we can only freshen it by
writing a new loose or packed copy of that object with a more recent
mtime.

Prior to 61568efa95 (builtin/pack-objects.c: support `--max-pack-size`
with `--cruft`, 2023-08-28), we typically had at most one cruft pack in
a repository at any given time. So freshening unreachable objects was
straightforward when already rewriting the cruft pack (and its *.mtimes
file).

But 61568efa95 changes things: 'pack-objects' now supports writing
multiple cruft packs when invoked with `--cruft` and the
`--max-pack-size` flag. Cruft packs are rewritten until they reach some
size threshold, at which point they are considered "frozen", and will
only be modified in a pruning GC, or if the threshold itself is
adjusted.

Prior to this patch, however, this process breaks down when we attempt
to freshen an object packed in an earlier cruft pack, and that cruft
pack is larger than the threshold and thus will survive the repack.

When this is the case, it is impossible to freshen objects in cruft
pack(s) when those cruft packs are larger than the threshold. This is
because we would avoid writing them in the new cruft pack entirely, for
a couple of reasons.

 1. When enumerating packed objects via 'add_objects_in_unpacked_packs()'
    we pass the SKIP_IN_CORE_KEPT_PACKS, which is used to avoid looping
    over the packs we're going to retain (which are marked as kept
    in-core by 'read_cruft_objects()').

    This means that we will avoid enumerating additional packed copies
    of objects found in any cruft packs which are larger than the given
    size threshold. Thus there is no opportunity to call
    'create_object_entry()' whatsoever.

 2. We likewise will discard the loose copy (if one exists) of any
    unreachable object packed in a cruft pack that is larger than the
    threshold. Here our call path is 'add_unreachable_loose_objects()',
    which uses the 'add_loose_object()' callback.

    That function will eventually land us in 'want_object_in_pack()'
    (via 'add_cruft_object_entry()'), and we'll discard the object as it
    appears in one of the packs which we marked as kept in-core.

This means in effect that it is impossible to freshen an unreachable
object once it appears in a cruft pack larger than the given threshold.

Instead, we should pack an additional copy of an unreachable object we
want to freshen even if it appears in a cruft pack, provided that the
cruft copy has an mtime which is before the mtime of the copy we are
trying to pack/freshen. This is sub-optimal in the sense that it
requires keeping an additional copy of unreachable objects upon
freshening, but we don't have a better alternative without the ability
to make in-place modifications to existing *.mtimes files.

In order to implement this, we have to adjust the behavior of
'want_found_object()'. When 'pack-objects' is told that we're *not*
going to retain any cruft packs (i.e. the set of packs marked as kept
in-core does not contain a cruft pack), the behavior is unchanged.

But when there *is* at least one cruft pack that we're holding onto, it
is no longer sufficient to reject a copy of an object found in that
cruft pack for that reason alone. In this case, we only want to reject a
candidate object when copies of that object either:

 - exists in a non-cruft pack that we are retaining, regardless of that
   pack's mtime, or

 - exists in a cruft pack with an mtime at least as recent as the copy
   we are debating whether or not to pack, in which case freshening
   would be redundant.

To do this, keep track of whether or not we have any cruft packs in our
in-core kept list with a new 'ignore_packed_keep_in_core_has_cruft'
flag. When we end up in this new special case, we replace a call to
'has_object_kept_pack()' to 'want_cruft_object_mtime()', and only reject
objects when we have a copy in an existing cruft pack with at least as
recent an mtime as our candidate (in which case "freshening" would be
redundant).

Signed-off-by: Taylor Blau <me@ttaylorr.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2025-03-13 11:48:04 -07:00
.github Merge branch 'jk/ci-coverity-update' 2025-02-10 10:18:31 -08:00
Documentation Git 2.49-rc0 2025-02-26 08:55:18 -08:00
bin-wrappers
block-sha1
builtin builtin/pack-objects.c: freshen objects from existing cruft packs 2025-03-13 11:48:04 -07:00
ci Merge branch 'ps/zlib-ng' 2025-02-06 14:56:45 -08:00
compat compat/mingw: rename the symlink, not the target 2025-02-21 10:24:43 -08:00
contrib Merge branch 'ad/set-default-target-in-makefiles' 2025-02-25 14:19:36 -08:00
ewah
git-gui Merge branch 'ad/set-default-target-in-makefiles' 2025-02-25 14:19:36 -08:00
gitk-git Merge branch 'master' of https://github.com/j6t/gitk 2025-02-20 05:59:56 -08:00
gitweb
mergetools
negotiator
oss-fuzz Merge branch 'ps/build-meson-fixes' 2025-02-03 10:23:34 -08:00
perl meson: fix perl dependencies 2025-01-08 08:05:39 -08:00
po gitk: introduce support for the Meson build system 2025-02-20 08:52:15 +01:00
refs Merge branch 'kn/reflog-migration-fix-followup' 2025-02-14 17:53:48 -08:00
reftable Merge branch 'kn/reflog-migration-fix-followup' 2025-02-14 17:53:48 -08:00
sha1
sha1collisiondetection@855827c583
sha1dc
sha256
subprojects
t builtin/pack-objects.c: freshen objects from existing cruft packs 2025-03-13 11:48:04 -07:00
templates Makefile: set default goals in makefiles 2025-02-18 09:02:26 -08:00
trace2 global: adapt callers to use generic hash context helpers 2025-01-31 10:06:11 -08:00
xdiff xdiff: avoid signed vs. unsigned comparisons in xutils.c 2025-02-12 09:41:17 -08:00
.cirrus.yml
.clang-format
.editorconfig editorconfig: add .adoc extension 2025-01-21 12:56:05 -08:00
.gitattributes Remove obsolete ".txt" extensions for AsciiDoc files 2025-01-21 12:56:10 -08:00
.gitignore Merge branch 'ds/backfill' 2025-02-18 15:30:31 -08:00
.gitlab-ci.yml Merge branch 'jt/gitlab-ci-base-fix' 2025-02-10 10:18:30 -08:00
.gitmodules
.mailmap
.tsan-suppressions
CODE_OF_CONDUCT.md
COPYING
GIT-BUILD-OPTIONS.in Merge branch 'ps/3.0-remote-deprecation' 2025-02-03 10:23:33 -08:00
GIT-VERSION-FILE.in
GIT-VERSION-GEN Git 2.49-rc0 2025-02-26 08:55:18 -08:00
INSTALL
LGPL-2.1
Makefile Merge branch 'tb/new-make-fix' 2025-02-25 14:19:35 -08:00
README.md
RelNotes doc: use .adoc extension for AsciiDoc files 2025-01-21 12:56:06 -08:00
SECURITY.md
abspath.c
abspath.h
aclocal.m4
add-interactive.c
add-interactive.h
add-patch.c
advice.c Merge branch 'ps/build-sign-compare' 2024-12-23 09:32:11 -08:00
advice.h
alias.c
alias.h
alloc.c
alloc.h
apply.c Merge branch 'pw/apply-ulong-overflow-check' 2025-02-10 10:18:30 -08:00
apply.h
archive-tar.c compat/zlib: provide stubs for `deflateSetHeader()` 2025-01-28 13:03:23 -08:00
archive-zip.c
archive.c git-compat-util: move include of "compat/zlib.h" into "git-zlib.h" 2025-01-28 13:03:22 -08:00
archive.h
attr.c Merge branch 'ps/build-sign-compare' 2024-12-23 09:32:11 -08:00
attr.h
banned.h
base85.c
base85.h
bisect.c commit-reach: use `size_t` to track indices when computing merge bases 2024-12-27 08:12:40 -08:00
bisect.h
blame.c
blame.h
blob.c
blob.h
bloom.c
bloom.h
branch.c
branch.h
builtin.h backfill: add builtin boilerplate 2025-02-03 16:12:41 -08:00
bulk-checkin.c Merge branch 'ps/hash-cleanup' 2025-02-10 10:18:31 -08:00
bulk-checkin.h
bundle-uri.c Merge branch 'ps/build-sign-compare' 2024-12-23 09:32:11 -08:00
bundle-uri.h
bundle.c bundle: avoid closing file descriptor twice 2025-01-25 18:38:11 -08:00
bundle.h bundle: avoid closing file descriptor twice 2025-01-25 18:38:11 -08:00
cache-tree.c
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 tree-diff: drop list-tail argument to diff_tree_paths() 2025-01-09 12:24:26 -08:00
command-list.txt backfill: add builtin boilerplate 2025-02-03 16:12:41 -08:00
commit-graph.c Merge branch 'ps/build-sign-compare' 2024-12-23 09:32:11 -08:00
commit-graph.h
commit-reach.c commit-reach: use `size_t` to track indices when computing merge bases 2024-12-27 08:12:40 -08:00
commit-reach.h commit-reach: use `size_t` to track indices when computing merge bases 2024-12-27 08:12:40 -08:00
commit-slab-decl.h
commit-slab-impl.h
commit-slab.h
commit.c commit-reach: use `size_t` to track indices in `get_reachable_subset()` 2024-12-27 08:11:45 -08:00
commit.h commit-reach: use `size_t` to track indices in `get_reachable_subset()` 2024-12-27 08:11:45 -08:00
common-exit.c common-main: split init and exit code into new files 2025-01-28 14:39:16 -08:00
common-init.c common-main: split init and exit code into new files 2025-01-28 14:39:16 -08:00
common-init.h common-main: split init and exit code into new files 2025-01-28 14:39:16 -08:00
common-main.c common-main: split init and exit code into new files 2025-01-28 14:39:16 -08:00
config.c git-compat-util: move include of "compat/zlib.h" into "git-zlib.h" 2025-01-28 13:03:22 -08:00
config.h
config.mak.dev
config.mak.in
config.mak.uname
configure.ac
connect.c connect: address -Wsign-compare warnings 2025-01-17 09:27:42 -08:00
connect.h
connected.c
connected.h
convert.c
convert.h
copy.c
copy.h
credential.c Merge branch 'ps/the-repository' 2025-01-21 08:44:54 -08:00
credential.h Merge branch 'ps/the-repository' 2025-01-21 08:44:54 -08:00
csum-file.c Merge branch 'ps/hash-cleanup' 2025-02-10 10:18:31 -08:00
csum-file.h hash: stop typedeffing the hash context 2025-01-31 10:06:10 -08:00
ctype.c
daemon.c Merge branch 'ps/build-sign-compare' 2024-12-23 09:32:11 -08:00
date.c date.c: Fix type missmatch warings from msvc 2024-12-26 13:34:28 -08:00
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 run_diff_files(): de-mystify the size of combine_diff_path struct 2025-01-09 12:24:24 -08:00
diff-merges.c
diff-merges.h
diff-no-index.c
diff.c Merge branch 'bc/diff-reject-empty-arg-to-pickaxe' 2025-02-25 14:19:35 -08:00
diff.h Merge branch 'ps/hash-cleanup' 2025-02-10 10:18:31 -08:00
diffcore-break.c
diffcore-delta.c
diffcore-order.c
diffcore-pickaxe.c
diffcore-rename.c
diffcore-rotate.c
diffcore.h
dir-iterator.c
dir-iterator.h
dir.c backfill: add --sparse option 2025-02-03 16:12:42 -08:00
dir.h backfill: add --sparse option 2025-02-03 16:12:42 -08:00
editor.c
editor.h
entry.c
entry.h
environment.c git-compat-util: move include of "compat/zlib.h" into "git-zlib.h" 2025-01-28 13:03:22 -08:00
environment.h
exec-cmd.c
exec-cmd.h
fetch-negotiator.c
fetch-negotiator.h
fetch-pack.c Merge branch 'kn/pack-write-with-reduced-globals' 2025-02-03 10:23:34 -08:00
fetch-pack.h
fmt-merge-msg.c
fmt-merge-msg.h
fsck.c fsck: reject misconfigured fsck.skipList 2025-01-07 09:22:25 -08:00
fsck.h
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 doc: use .adoc extension for AsciiDoc files 2025-01-21 12:56:06 -08:00
generate-configlist.sh doc: use .adoc extension for AsciiDoc files 2025-01-21 12:56:06 -08:00
generate-hooklist.sh doc: use .adoc extension for AsciiDoc files 2025-01-21 12:56:06 -08:00
generate-perl.sh
generate-python.sh
generate-script.sh
gettext.c
gettext.h
git-archimport.perl
git-compat-util.h Merge branch 'ps/zlib-ng' 2025-02-06 14:56:45 -08:00
git-curl-compat.h
git-cvsexportcommit.perl
git-cvsimport.perl
git-cvsserver.perl
git-difftool--helper.sh
git-filter-branch.sh
git-instaweb.sh instaweb: fix ip binding for the python http.server 2025-01-10 15:27:52 -08:00
git-merge-octopus.sh
git-merge-one-file.sh
git-merge-resolve.sh
git-mergetool--lib.sh
git-mergetool.sh
git-p4.py
git-quiltimport.sh
git-request-pull.sh
git-send-email.perl
git-sh-i18n.sh
git-sh-setup.sh
git-submodule.sh
git-svn.perl
git-web--browse.sh
git-zlib.c git-zlib: cast away potential constness of `next_in` pointer 2025-01-28 13:03:23 -08:00
git-zlib.h git-compat-util: move include of "compat/zlib.h" into "git-zlib.h" 2025-01-28 13:03:22 -08:00
git.c backfill: add builtin boilerplate 2025-02-03 16:12:41 -08:00
git.rc.in
gpg-interface.c
gpg-interface.h
graph.c
graph.h
grep.c
grep.h
hash-lookup.c
hash-lookup.h
hash.h hash: provide generic wrappers to update hash contexts 2025-01-31 10:06:11 -08:00
hashmap.c
hashmap.h
help.c help: add "show" as a valid configuration value 2025-02-03 15:22:05 -08: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 global: adapt callers to use generic hash context helpers 2025-01-31 10:06:11 -08:00
http-walker.c
http.c global: adapt callers to use generic hash context helpers 2025-01-31 10:06:11 -08:00
http.h hash: stop typedeffing the hash context 2025-01-31 10:06:10 -08:00
ident.c
ident.h
imap-send.c
iterator.h
json-writer.c
json-writer.h
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
list-objects-filter.h
list-objects.c Merge branch 'ps/build-sign-compare' 2024-12-23 09:32:11 -08:00
list-objects.h
list.h
lockfile.c
lockfile.h
log-tree.c
log-tree.h
loose.c
loose.h
ls-refs.c
ls-refs.h
mailinfo.c
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.h
merge-recursive.c
merge-recursive.h
merge.c
merge.h
mergesort.h
meson.build Merge branch 'po/meson-perl-fix' 2025-02-25 14:19:37 -08:00
meson_options.txt Merge branch 'ps/zlib-ng' 2025-02-06 14:56:45 -08:00
midx-write.c Merge branch 'kn/pack-write-with-reduced-globals' 2025-02-03 10:23:34 -08:00
midx.c Merge branch 'ps/build-sign-compare' 2024-12-23 09:32:11 -08:00
midx.h
name-hash.c
name-hash.h
notes-cache.c
notes-cache.h
notes-merge.c
notes-merge.h
notes-utils.c
notes-utils.h
notes.c
notes.h
object-file-convert.c
object-file-convert.h
object-file.c Merge branch 'tb/unsafe-hash-cleanup' 2025-02-03 10:23:32 -08:00
object-file.h
object-name.c object-name: be more strict in parsing describe-like output 2025-01-13 11:48:43 -08:00
object-name.h
object-store-ll.h
object-store.h
object.c
object.h
oid-array.c
oid-array.h
oidmap.c
oidmap.h
oidset.c
oidset.h
oidtree.c
oidtree.h
pack-bitmap-write.c
pack-bitmap.c Merge branch 'ps/the-repository' 2025-01-21 08:44:54 -08:00
pack-bitmap.h
pack-check.c global: adapt callers to use generic hash context helpers 2025-01-31 10:06:11 -08:00
pack-mtimes.c
pack-mtimes.h
pack-objects.c
pack-objects.h Merge branch 'ds/name-hash-tweaks' 2025-02-12 10:08:51 -08:00
pack-revindex.c
pack-revindex.h
pack-write.c Merge branch 'ps/hash-cleanup' 2025-02-10 10:18:31 -08:00
pack.h Merge branch 'kn/pack-write-with-reduced-globals' 2025-02-03 10:23:34 -08:00
packfile.c builtin/pack-objects.c: freshen objects from existing cruft packs 2025-03-13 11:48:04 -07:00
packfile.h builtin/pack-objects.c: freshen objects from existing cruft packs 2025-03-13 11:48:04 -07:00
pager.c
pager.h
parallel-checkout.c
parallel-checkout.h
parse-options-cb.c
parse-options.c Merge branch 'jc/show-usage-help' 2025-01-28 13:02:22 -08:00
parse-options.h parse-options: introduce die_for_incompatible_opt2() 2025-02-06 12:23:54 -08:00
parse.c
parse.h
patch-delta.c
patch-ids.c
patch-ids.h
path-walk.c backfill: add --sparse option 2025-02-03 16:12:42 -08:00
path-walk.h backfill: add --sparse option 2025-02-03 16:12:42 -08:00
path.c Merge branch 'ps/build-sign-compare' 2024-12-23 09:32:11 -08:00
path.h
pathspec.c
pathspec.h
pkt-line.c
pkt-line.h
preload-index.c
preload-index.h
pretty.c
pretty.h
prio-queue.c
prio-queue.h prio-queue: fix type of `insertion_ctr` 2024-12-27 08:10:41 -08:00
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
prune-packed.h
pseudo-merge.c
pseudo-merge.h
quote.c
quote.h
range-diff.c Merge branch 'js/range-diff-diff-merges' 2024-12-23 09:32:17 -08:00
range-diff.h
reachable.c
reachable.h
read-cache-ll.h
read-cache.c global: adapt callers to use generic hash context helpers 2025-01-31 10:06:11 -08:00
read-cache.h
rebase-interactive.c
rebase-interactive.h
rebase.c
rebase.h
ref-filter.c Merge branch 'rs/ref-fitler-used-atoms-value-fix' 2025-01-29 14:05:09 -08:00
ref-filter.h ref-filter: remove ref_format_clear() 2025-01-21 09:06:24 -08:00
reflog-walk.c
reflog-walk.h
reflog.c
reflog.h
refs.c Merge branch 'kn/reflog-migration-fix-followup' 2025-02-14 17:53:48 -08:00
refs.h refs: mark `ref_transaction_update_reflog()` as static 2025-01-22 09:51:35 -08:00
refspec.c refspec: clarify function naming and documentation 2025-02-18 09:44:27 -08:00
refspec.h refspec: clarify function naming and documentation 2025-02-18 09:44:27 -08:00
remote-curl.c
remote.c refspec: clarify function naming and documentation 2025-02-18 09:44:27 -08:00
remote.h Merge branch 'tc/clone-single-revision' 2025-02-14 17:53:48 -08:00
replace-object.c
replace-object.h
repo-settings.c
repo-settings.h
repository.c
repository.h
rerere.c global: adapt callers to use generic hash context helpers 2025-01-31 10:06:11 -08:00
rerere.h
reset.c
reset.h
resolve-undo.c
resolve-undo.h
revision.c Merge branch 'ps/build-sign-compare' 2024-12-23 09:32:11 -08:00
revision.h
run-command.c
run-command.h
sane-ctype.h
scalar.c Merge branch 'ps/leakfixes-0129' 2025-02-06 14:56:45 -08:00
send-pack.c send-pack: gracefully close the connection for atomic push 2025-02-03 15:24:58 -08:00
send-pack.h send-pack: new return code "ERROR_SEND_PACK_BAD_REF_STATUS" 2025-02-03 15:24:57 -08:00
sequencer.c
sequencer.h
serve.c
serve.h
server-info.c
server-info.h
setup.c setup: fix reinit of repos with incompatible GIT_DEFAULT_HASH 2025-01-30 14:36:41 -08:00
setup.h
sh-i18n--envsubst.c
sha1dc_git.c
sha1dc_git.h
shallow.c sign-compare: avoid comparing ptrdiff with an int/unsigned 2024-12-27 12:25:30 -08:00
shallow.h shallow: fix -Wsign-compare warnings 2024-12-27 08:12:40 -08:00
shared.mak GIT-VERSION-GEN: fix overriding GIT_BUILT_FROM_COMMIT and GIT_DATE 2024-12-20 12:36:45 -08:00
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 Git 2.47.2 2025-01-13 12:55:26 -08:00
strbuf.h Git 2.47.2 2025-01-13 12:55:26 -08:00
streaming.c
streaming.h
string-list.c
string-list.h
strmap.c
strmap.h
strvec.c Merge branch 'ps/build-sign-compare' 2024-12-23 09:32:11 -08:00
strvec.h
sub-process.c
sub-process.h
submodule-config.c
submodule-config.h
submodule.c Merge branch 'sk/calloc-not-malloc-plus-memset' 2024-12-23 09:32:18 -08:00
submodule.h
symlinks.c
symlinks.h
tag.c Merge branch 'ps/build-sign-compare' 2024-12-23 09:32:11 -08:00
tag.h
tar.h
tempfile.c
tempfile.h
thread-utils.c
thread-utils.h Revert barrier-based LSan threading race workaround 2025-01-01 14:13:01 -08:00
tmp-objdir.c
tmp-objdir.h
trace.c
trace.h
trace2.c Merge branch 'am/trace2-with-valueless-true' 2025-01-29 14:05:10 -08:00
trace2.h
trailer.c
trailer.h
transport-helper.c
transport-internal.h
transport.c Merge branch 'ps/send-pack-unhide-error-in-atomic-push' 2025-02-18 15:30:32 -08:00
transport.h
tree-diff.c tree-diff: make list tail-passing more explicit 2025-01-09 12:24:27 -08:00
tree-walk.c
tree-walk.h
tree.c
tree.h
unicode-width.h
unimplemented.sh
unix-socket.c Merge branch 'ps/leakfixes-0129' 2025-02-06 14:56:45 -08:00
unix-socket.h
unix-stream-server.c
unix-stream-server.h
unpack-trees.c
unpack-trees.h
upload-pack.c
upload-pack.h
url.c
url.h
urlmatch.c
urlmatch.h
usage.c usage: add show_usage_if_asked() 2025-01-17 13:30:02 -08:00
userdiff.c
userdiff.h
utf8.c
utf8.h
varint.c
varint.h
version-def.h.in
version.c meson: ensure correct version-def.h is used 2025-01-14 11:14:54 -08:00
version.h
versioncmp.c
versioncmp.h
walker.c
walker.h
wildmatch.c
wildmatch.h
worktree.c worktree: detect from secondary worktree if main worktree is bare 2025-02-05 09:46:23 -08:00
worktree.h
wrapper.c wrapper: allow generating insecure random bytes 2025-01-07 09:04:18 -08:00
wrapper.h wrapper: allow generating insecure random bytes 2025-01-07 09:04:18 -08:00
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.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 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