Go to file
Karthik Nayak bc67b4ab5f reftable: write correct max_update_index to header
In 297c09eabb (refs: allow multiple reflog entries for the same refname,
2024-12-16), the reftable backend learned to handle multiple reflog
entries within the same transaction. This was done modifying the
`update_index` for reflogs with multiple indices. During writing the
logs, the `max_update_index` of the writer was modified to ensure the
limits were raised to the modified `update_index`s.

However, since ref entries are written before the modification to the
`max_update_index`, if there are multiple blocks to be written, the
reftable backend writes the header with the old `max_update_index`. When
all logs are finally written, the footer will be written with the new
`min_update_index`. This causes a mismatch between the header and the
footer and causes the reftable file to be corrupted. The existing tests
only spawn a single block and since headers are lazily written with the
first block, the tests didn't capture this bug.

To fix the issue, the appropriate `max_update_index` limit must be set
even before the first block is written. Add a `max_index` field to the
transaction which holds the `max_index` within all its updates, then
propagate this value to the reftable backend, wherein this is used to
the set the `max_update_index` correctly.

Add a test which creates a few thousand reference updates with multiple
reflog entries, which should trigger the bug.

Reported-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Karthik Nayak <karthik.188@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2025-01-15 09:12:09 -08:00
.github
Documentation refs: add support for migrating reflogs 2024-12-16 09:45:34 -08:00
block-sha1
builtin Merge branch 'kn/pass-repo-to-builtin-sub-sub-commands' 2024-12-04 10:14:47 +09:00
ci test-lib: unconditionally enable leak checking 2024-11-21 08:23:47 +09:00
compat Merge branch 'ak/typofixes' into maint-2.47 2024-11-25 12:29:48 +09:00
contrib Merge branch 'bc/drop-ancient-libcurl-and-perl' 2024-12-04 10:14:48 +09:00
ewah
git-gui Merge https://github.com/j6t/git-gui 2024-11-11 12:47:44 +09:00
gitk-git
gitweb gitweb: make use of s///r 2024-10-23 16:16:36 -04:00
mergetools
negotiator
oss-fuzz
perl Require Perl 5.26.0 2024-10-23 16:16:36 -04:00
po
refs reftable: write correct max_update_index to header 2025-01-15 09:12:09 -08:00
reftable Merge branch 'kn/reftable-writer-log-write-verify' into kn/reflog-migration 2024-12-15 15:49:01 -08:00
sha1
sha1collisiondetection@855827c583
sha1dc
sha256
t reftable: write correct max_update_index to header 2025-01-15 09:12:09 -08:00
templates
trace2
xdiff
.cirrus.yml
.clang-format clang-format: align consecutive macro definitions 2024-10-18 17:37:16 -04:00
.editorconfig
.gitattributes
.gitignore
.gitlab-ci.yml
.gitmodules
.mailmap
.tsan-suppressions
CODE_OF_CONDUCT.md
COPYING
GIT-VERSION-GEN Prepare for 2.47.1 2024-11-20 14:43:30 +09:00
INSTALL Require Perl 5.26.0 2024-10-23 16:16:36 -04:00
LGPL-2.1
Makefile Makefile(s): avoid recipe prefix in conditional statements 2024-11-24 13:45:49 +01:00
README.md
RelNotes Prepare for 2.47.1 2024-11-20 14:43:30 +09: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.h
archive-tar.c
archive-zip.c
archive.c
archive.h
attr.c
attr.h
banned.h
base85.c
base85.h
bisect.c bisect: address Coverity warning about potential double free 2024-11-26 10:22:24 +09:00
bisect.h bisect: fix leaking good/bad terms when reading multipe times 2024-11-21 08:23:40 +09:00
blame.c builtin/blame: fix leaking blame entries with `--incremental` 2024-11-21 08:23:40 +09:00
blame.h builtin/blame: fix leaking blame entries with `--incremental` 2024-11-21 08:23:40 +09:00
blob.c
blob.h
bloom.c
bloom.h
branch.c refs: allow passing flags when setting up a transaction 2024-11-21 07:59:14 +09:00
branch.h
builtin.h
bulk-checkin.c
bulk-checkin.h
bundle-uri.c
bundle-uri.h
bundle.c
bundle.h
cache-tree.c Merge branch 'ps/cache-tree-w-broken-index-entry' into maint-2.47 2024-11-20 14:42:59 +09: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 combine-diff: fix leaking lost lines 2024-11-04 22:37:55 -08:00
command-list.txt
commit-graph.c
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-main.c
config.c
config.h
config.mak.dev
config.mak.in
config.mak.uname
configure.ac
connect.c
connect.h
connected.c packfile: use object_id in find_pack_entry_one() 2024-10-25 17:35:46 -04:00
connected.h
convert.c
convert.h
copy.c
copy.h
credential.c
credential.h
csum-file.c
csum-file.h
ctype.c
daemon.c daemon: replace atoi() with strtoul_ui() and strtol_i() 2024-10-24 14:03:43 -04:00
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 Merge branch 'jk/output-prefix-cleanup' into maint-2.47 2024-11-25 12:29:39 +09:00
diff-merges.c
diff-merges.h
diff-no-index.c
diff.c Merge branch 'jk/output-prefix-cleanup' into maint-2.47 2024-11-25 12:29:39 +09:00
diff.h Merge branch 'jk/output-prefix-cleanup' into maint-2.47 2024-11-25 12:29:39 +09: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 dir: fix leak when parsing "status.showUntrackedFiles" 2024-11-04 22:37:56 -08:00
dir.h
editor.c
editor.h
entry.c
entry.h
environment.c
environment.h
exec-cmd.c
exec-cmd.h
fetch-negotiator.c
fetch-negotiator.h
fetch-pack.c fetch-pack: die if in commit graph but not obj db 2024-11-05 18:57:22 -08:00
fetch-pack.h
fmt-merge-msg.c
fmt-merge-msg.h
fsck.c
fsck.h ref: add symlink ref content check for files backend 2024-11-21 08:21:34 +09: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 global: Fix duplicate word typos 2024-10-21 16:05:04 -04:00
fsmonitor.h
generate-cmdlist.sh
generate-configlist.sh
generate-hooklist.sh
gettext.c
gettext.h
git-archimport.perl Require Perl 5.26.0 2024-10-23 16:16:36 -04:00
git-compat-util.h git-compat-util: drop now-unused `UNLEAK()` macro 2024-11-21 08:23:46 +09:00
git-curl-compat.h git-curl-compat: remove check for curl 7.56.0 2024-10-23 16:16:35 -04:00
git-cvsexportcommit.perl Require Perl 5.26.0 2024-10-23 16:16:36 -04:00
git-cvsimport.perl Require Perl 5.26.0 2024-10-23 16:16:36 -04:00
git-cvsserver.perl Require Perl 5.26.0 2024-10-23 16:16:36 -04: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 Require Perl 5.26.0 2024-10-23 16:16:36 -04:00
git-sh-i18n.sh
git-sh-setup.sh
git-submodule.sh
git-svn.perl Require Perl 5.26.0 2024-10-23 16:16:36 -04:00
git-web--browse.sh
git-zlib.c
git-zlib.h
git.c help: fix leaking return value from `help_unknown_cmd()` 2024-11-21 08:23:44 +09:00
git.rc
gpg-interface.c
gpg-interface.h
graph.c Merge branch 'jk/output-prefix-cleanup' into maint-2.47 2024-11-25 12:29:39 +09:00
graph.h
grep.c Merge branch 'ps/leakfixes-part-9' 2024-11-13 08:35:31 +09:00
grep.h
hash-lookup.c
hash-lookup.h
hash.h
hashmap.c
hashmap.h
help.c help: fix leaking return value from `help_unknown_cmd()` 2024-11-21 08:23:44 +09:00
help.h help: fix leaking return value from `help_unknown_cmd()` 2024-11-21 08:23:44 +09:00
hex-ll.c
hex-ll.h
hex.c
hex.h
hook.c
hook.h
http-backend.c
http-fetch.c
http-push.c packfile: convert find_sha1_pack() to use object_id 2024-10-25 17:35:46 -04:00
http-walker.c packfile: convert find_sha1_pack() to use object_id 2024-10-25 17:35:46 -04:00
http.c Merge branch 'bc/drop-ancient-libcurl-and-perl' 2024-12-04 10:14:48 +09:00
http.h
ident.c
ident.h
imap-send.c Merge branch 'bc/drop-ancient-libcurl-and-perl' 2024-12-04 10:14:48 +09:00
iterator.h
json-writer.c
json-writer.h
khash.h
kwset.c
kwset.h
levenshtein.c
levenshtein.h
line-log.c line-log: fix leak when rewriting commit parents 2024-11-21 08:23:42 +09:00
line-log.h
line-range.c
line-range.h
linear-assignment.c
linear-assignment.h
list-objects-filter-options.c list-objects-filter-options: work around reported leak on error 2024-11-04 22:37:57 -08:00
list-objects-filter-options.h
list-objects-filter.c
list-objects-filter.h
list-objects.c
list-objects.h
list.h
lockfile.c
lockfile.h
log-tree.c Merge branch 'jk/output-prefix-cleanup' into maint-2.47 2024-11-25 12:29:39 +09:00
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: replace atoi() with strtol_i() for marker size validation 2024-10-24 14:03:44 -04:00
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
midx-write.c
midx.c packfile: use object_id in find_pack_entry_one() 2024-10-25 17:35:46 -04: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 object-file: inline empty tree and blob literals 2024-11-18 21:48:48 +09:00
object-file.h
object-name.c
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 global: Fix duplicate word typos 2024-10-21 16:05:04 -04:00
oidtree.h
pack-bitmap-write.c
pack-bitmap.c Merge branch 'tb/boundary-traversal-fix' 2024-12-04 10:14:44 +09:00
pack-bitmap.h
pack-check.c
pack-mtimes.c
pack-mtimes.h
pack-objects.c
pack-objects.h
pack-revindex.c
pack-revindex.h
pack-write.c
pack.h
packfile.c packfile: use oidread() instead of hashcpy() to fill object_id 2024-10-25 17:35:46 -04:00
packfile.h packfile: use object_id in find_pack_entry_one() 2024-10-25 17:35:46 -04:00
pager.c
pager.h
parallel-checkout.c
parallel-checkout.h
parse-options-cb.c
parse-options.c
parse-options.h builtin: pass repository to sub commands 2024-11-26 10:36:08 +09:00
parse.c
parse.h
patch-delta.c
patch-ids.c
patch-ids.h
path.c
path.h
pathspec.c
pathspec.h
pkt-line.c
pkt-line.h
preload-index.c
preload-index.h
pretty.c pretty: clear signature check 2024-11-04 22:37:53 -08:00
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
prune-packed.h
pseudo-merge.c
pseudo-merge.h
quote.c
quote.h
range-diff.c Merge branch 'jk/output-prefix-cleanup' into maint-2.47 2024-11-25 12:29:39 +09:00
range-diff.h
reachable.c
reachable.h
read-cache-ll.h global: Fix duplicate word typos 2024-10-21 16:05:04 -04:00
read-cache.c Merge branch 'ps/cache-tree-w-broken-index-entry' into maint-2.47 2024-11-20 14:42:59 +09:00
read-cache.h
rebase-interactive.c
rebase-interactive.h
rebase.c
rebase.h
ref-filter.c ref-filter: format iteratively with lexicographic refname sorting 2024-10-21 16:46:03 -04:00
ref-filter.h
reflog-walk.c
reflog-walk.h
reflog.c reflog: rename unreachable 2024-11-18 09:42:08 +09:00
reflog.h
refs.c reftable: write correct max_update_index to header 2025-01-15 09:12:09 -08:00
refs.h refs: introduce the `ref_transaction_update_reflog` function 2024-12-16 09:45:34 -08:00
refspec.c refspec: store raw refspecs inside refspec_item 2024-11-12 18:16:48 +09:00
refspec.h refspec: store raw refspecs inside refspec_item 2024-11-12 18:16:48 +09:00
remote-curl.c
remote.c
remote.h
replace-object.c
replace-object.h
repo-settings.c
repo-settings.h
repository.c
repository.h
rerere.c
rerere.h
reset.c
reset.h
resolve-undo.c
resolve-undo.h
revision.c bisect: fix leaking good/bad terms when reading multipe times 2024-11-21 08:23:40 +09:00
revision.h
run-command.c
run-command.h
sane-ctype.h
scalar.c
send-pack.c
send-pack.h
sequencer.c Merge branch 'kh/sequencer-comment-char' 2024-12-06 13:23:18 +09: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
shallow.h
shared.mak
shell.c
shortlog.h
sideband.c
sideband.h
sigchain.c
sigchain.h
simple-ipc.h
sparse-index.c sparse-index: correctly free EWAH contents 2024-11-04 22:37:56 -08:00
sparse-index.h
split-index.c split-index: fix memory leak in `move_cache_to_base_index()` 2024-11-21 08:23:43 +09:00
split-index.h
stable-qsort.c
statinfo.c
statinfo.h
strbuf.c
strbuf.h
streaming.c
streaming.h
string-list.c
string-list.h
strmap.c
strmap.h
strvec.c strvec: introduce new `strvec_splice()` function 2024-11-21 08:23:42 +09:00
strvec.h strvec: introduce new `strvec_splice()` function 2024-11-21 08:23:42 +09:00
sub-process.c
sub-process.h
submodule-config.c
submodule-config.h
submodule.c refspec: store raw refspecs inside refspec_item 2024-11-12 18:16:48 +09:00
submodule.h
symlinks.c
symlinks.h
tag.c
tag.h
tar.h
tempfile.c
tempfile.h
thread-utils.c
thread-utils.h
tmp-objdir.c
tmp-objdir.h
trace.c
trace.h
trace2.c
trace2.h
trailer.c Merge branch 'la/trailer-info' 2024-11-20 14:47:17 +09:00
trailer.h
transport-helper.c transport-helper: fix leaking import/export marks 2024-11-04 22:37:54 -08:00
transport-internal.h
transport.c
transport.h
tree-diff.c
tree-walk.c
tree-walk.h
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 Merge branch 'en/shallow-exclude-takes-a-ref-fix' 2024-11-13 08:35:32 +09:00
upload-pack.h
url.c
url.h
urlmatch.c
urlmatch.h
usage.c git-compat-util: drop now-unused `UNLEAK()` macro 2024-11-21 08:23:46 +09:00
userdiff.c
userdiff.h
utf8.c
utf8.h
varint.c
varint.h
version.c
version.h
versioncmp.c
versioncmp.h
walker.c refs: allow passing flags when setting up a transaction 2024-11-21 07:59:14 +09:00
walker.h http-walker: use object_id instead of bare hash 2024-10-25 17:35:46 -04:00
wildmatch.c
wildmatch.h
worktree.c
worktree.h
wrap-for-bin.sh
wrapper.c
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.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