Go to file
Jeff King f8535596aa bug_fl(): correctly initialize trace2 va_list
The code added 0cc05b044f (usage.c: add a non-fatal bug() function to go
with BUG(), 2022-06-02) sets up two va_list variables: one to output to
stderr, and one to trace2. But the order of initialization is wrong:

  va_list ap, cp;
  va_copy(cp, ap);
  va_start(ap, fmt);

We copy the contents of "ap" into "cp" before it is initialized, meaning
it is full of garbage. The two should be swapped.

However, there's another bug, noticed by Johannes Schindelin: we forget
to call va_end() for the copy. So instead of just fixing the copy's
initialization, let's do two separate start/end pairs. This is allowed
by the standard, and we don't need to use copy here since we have access
to the original varargs. Matching the pairs with the calls makes it more
obvious that everything is being done correctly.

Note that we do call bug_fl() in the tests, but it didn't trigger this
problem because our format string doesn't have any placeholders. So even
though we were passing a garbage va_list through the stack, nobody ever
needed to look at it. We can easily adjust one of the trace2 tests to
trigger this, both for bug() and for BUG(). The latter isn't broken, but
it's nice to exercise both a bit more. Without the fix in this patch
(but with the test change), the bug() case causes a segfault.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-06-16 13:28:22 -07:00
.github
Documentation usage.c: add a non-fatal bug() function to go with BUG() 2022-06-02 12:51:35 -07:00
block-sha1
builtin receive-pack: use bug() and BUG_if_bug() 2022-06-02 12:51:35 -07:00
ci Merge branch 'js/use-builtin-add-i' 2022-05-30 23:24:03 -07:00
compat Merge branch 'js/ci-gcc-12-fixes' 2022-05-31 19:10:35 -07:00
contrib Merge branch 'ep/maint-equals-null-cocci' 2022-05-20 15:26:59 -07:00
ewah Merge branch 'ep/maint-equals-null-cocci' 2022-05-20 15:26:59 -07:00
git-gui
gitk-git Merge branch 'master' of git://git.ozlabs.org/~paulus/gitk 2022-05-11 08:25:02 -07:00
gitweb
mergetools mergetools: add description to all diff/merge tools 2022-04-03 15:10:04 -07:00
negotiator
perl
po l10n: sv.po: Update Swedish translation (5282t0f0u) 2022-04-17 18:13:34 +01:00
ppc
refs Merge branch 'ep/maint-equals-null-cocci' 2022-05-20 15:26:59 -07:00
reftable Merge branch 'ep/maint-equals-null-cocci' 2022-05-20 15:26:59 -07:00
sha1collisiondetection@855827c583
sha1dc
sha256
t bug_fl(): correctly initialize trace2 va_list 2022-06-16 13:28:22 -07:00
templates
trace2
xdiff Merge branch 'ep/maint-equals-null-cocci' 2022-05-20 15:26:59 -07:00
.cirrus.yml
.clang-format
.editorconfig
.gitattributes
.gitignore fsmonitor--daemon: add a built-in fsmonitor daemon 2022-03-25 16:04:15 -07:00
.gitmodules
.mailmap
.tsan-suppressions
CODE_OF_CONDUCT.md
COPYING
GIT-VERSION-GEN Git 2.36.1 2022-05-05 14:36:37 -07:00
INSTALL
LGPL-2.1
Makefile Merge branch 'ep/coverage-report-wants-test-to-have-run' 2022-05-25 16:42:47 -07:00
README.md
RelNotes Git 2.36.1 2022-05-05 14:36:37 -07:00
SECURITY.md
abspath.c
aclocal.m4
add-interactive.c Merge branch 'pw/single-key-interactive' 2022-03-21 15:14:24 -07:00
add-interactive.h
add-patch.c
advice.c Merge branch 'tk/ambiguous-fetch-refspec' 2022-04-04 10:56:24 -07:00
advice.h Merge branch 'tk/ambiguous-fetch-refspec' 2022-04-04 10:56:24 -07:00
alias.c
alias.h
alloc.c alloc.[ch]: remove alloc_report() function 2022-04-01 10:16:11 -07:00
alloc.h alloc.[ch]: remove alloc_report() function 2022-04-01 10:16:11 -07:00
apply.c Merge branch 'ep/maint-equals-null-cocci' 2022-05-20 15:26:59 -07:00
apply.h
archive-tar.c
archive-zip.c
archive.c Merge branch 'jc/archive-add-file-normalize-mode' 2022-05-23 14:39:55 -07:00
archive.h
attr.c Merge branch 'ab/refs-various-fixes' 2022-03-29 12:22:02 -07:00
attr.h
banned.h
base85.c
bisect.c
bisect.h bisect: output state before we are ready to compute bisection 2022-05-11 12:35:11 -07:00
blame.c Merge branch 'ep/maint-equals-null-cocci' 2022-05-20 15:26:59 -07:00
blame.h
blob.c
blob.h
bloom.c
bloom.h
branch.c Merge branch 'tk/simple-autosetupmerge' 2022-05-26 14:51:30 -07:00
branch.h branch: new autosetupmerge option 'simple' for matching branches 2022-04-29 11:20:55 -07:00
builtin.h fsmonitor--daemon: add a built-in fsmonitor daemon 2022-03-25 16:04:15 -07:00
bulk-checkin.c Merge branch 'ns/core-fsyncmethod' 2022-03-25 16:38:24 -07:00
bulk-checkin.h
bundle.c bundle: output hash information in 'verify' 2022-03-23 13:14:09 -07:00
bundle.h
cache-tree.c cache-tree.c: use bug() and BUG_if_bug() 2022-06-02 12:55:16 -07:00
cache-tree.h
cache.h Merge branch 'ds/midx-normalize-pathname-before-comparison' 2022-05-04 09:51:29 -07:00
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-wide: apply equals-null.cocci 2022-05-02 09:50:37 -07:00
command-list.txt
commit-graph.c Merge branch 'ab/valgrind-fixes' 2022-05-23 14:39:54 -07:00
commit-graph.h
commit-reach.c
commit-reach.h
commit-slab-decl.h
commit-slab-impl.h
commit-slab.h
commit.c Merge branch 'ab/racy-hooks' 2022-03-30 18:01:10 -07:00
commit.h shallow: reset commit grafts when shallow is reset 2022-03-17 17:44:38 -07:00
common-main.c usage.c: add a non-fatal bug() function to go with BUG() 2022-06-02 12:51:35 -07:00
config.c Merge branch 'tk/simple-autosetupmerge' 2022-05-26 14:51:30 -07:00
config.h fsmonitor: config settings are repository-specific 2022-03-25 16:04:15 -07:00
config.mak.dev config.mak.dev: alternative workaround to gcc 12 warning in http.c 2022-04-15 16:27:04 -07:00
config.mak.in
config.mak.uname Merge branch 'jh/builtin-fsmonitor-part2' 2022-04-04 10:56:24 -07:00
configure.ac Merge branch 'ab/misc-cleanup' 2022-05-10 17:41:10 -07:00
connect.c
connect.h
connected.c
connected.h
convert.c convert: clarify line ending conversion warning 2022-04-08 12:53:34 -07:00
convert.h
copy.c
credential.c
credential.h
csum-file.c
csum-file.h
ctype.c
daemon.c Merge branch 'ep/maint-equals-null-cocci' for maint-2.35 2022-05-02 10:06:04 -07:00
date.c
date.h
decorate.c
decorate.h
delta-islands.c
delta-islands.h
delta.h
detect-compiler detect-compiler: make detection independent of locale 2022-05-09 08:52:26 -07:00
diff-delta.c
diff-lib.c
diff-merges.c
diff-merges.h
diff-no-index.c
diff.c diff: use mks_tempfile_dt() 2022-04-20 16:17:35 -07:00
diff.h
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 Merge branch 'js/ci-gcc-12-fixes' 2022-05-31 19:10:35 -07:00
dir.h
editor.c
entry.c
entry.h
environment.c Merge branch 'ds/midx-normalize-pathname-before-comparison' 2022-05-04 09:51:29 -07:00
environment.h
exec-cmd.c
exec-cmd.h
fetch-negotiator.c fetch-negotiator: add specific noop initializer 2022-03-28 10:25:52 -07:00
fetch-negotiator.h fetch-negotiator: add specific noop initializer 2022-03-28 10:25:52 -07:00
fetch-pack.c Merge branch 'jt/fetch-peek-optional-section' 2022-05-25 16:42:48 -07:00
fetch-pack.h fetch-pack: add refetch 2022-03-28 10:25:52 -07:00
fmt-merge-msg.c
fmt-merge-msg.h
fsck.c
fsck.h
fsmonitor--daemon.h fsmonitor--daemon: use a cookie file to sync with file system 2022-03-25 16:04:17 -07:00
fsmonitor-ipc.c fsmonitor-ipc: create client routines for git-fsmonitor--daemon 2022-03-25 16:04:15 -07:00
fsmonitor-ipc.h fsmonitor-ipc: create client routines for git-fsmonitor--daemon 2022-03-25 16:04:15 -07:00
fsmonitor-settings.c fsmonitor: config settings are repository-specific 2022-03-25 16:04:15 -07:00
fsmonitor-settings.h fsmonitor: config settings are repository-specific 2022-03-25 16:04:15 -07:00
fsmonitor.c fsmonitor: force update index after large responses 2022-03-25 16:04:17 -07:00
fsmonitor.h fsmonitor: config settings are repository-specific 2022-03-25 16:04:15 -07:00
fuzz-commit-graph.c
fuzz-pack-headers.c
fuzz-pack-idx.c
generate-cmdlist.sh
generate-configlist.sh
generate-hooklist.sh
gettext.c
gettext.h
git-add--interactive.perl
git-archimport.perl
git-bisect.sh
git-compat-util.h usage.c: add a non-fatal bug() function to go with BUG() 2022-06-02 12:51:35 -07: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
git-merge-octopus.sh
git-merge-one-file.sh
git-merge-resolve.sh
git-mergetool--lib.sh vimdiff: add tool documentation 2022-04-03 15:09:52 -07:00
git-mergetool.sh
git-p4.py Merge branch 'tk/p4-metadata-coding-strategies' 2022-05-20 15:27:00 -07:00
git-quiltimport.sh
git-request-pull.sh
git-send-email.perl i18n: fix some badly formatted i18n strings 2022-04-11 14:13:46 -07:00
git-sh-i18n.sh
git-sh-setup.sh
git-submodule.sh
git-svn.perl
git-web--browse.sh
git.c Merge branch 'gf/shorthand-version-and-help' 2022-05-20 15:26:53 -07:00
git.rc
gpg-interface.c
gpg-interface.h
graph.c
graph.h
grep.c
grep.h
hash-lookup.c
hash-lookup.h
hash.h
hashmap.c
hashmap.h
help.c Merge branch 'jh/builtin-fsmonitor-part2' 2022-04-04 10:56:24 -07:00
help.h
hex.c
hook.c
hook.h
http-backend.c
http-fetch.c Merge branch 'ep/maint-equals-null-cocci' for maint-2.35 2022-05-02 10:06:04 -07:00
http-push.c Merge branch 'ep/maint-equals-null-cocci' 2022-05-20 15:26:59 -07:00
http-walker.c tree-wide: apply equals-null.cocci 2022-05-02 09:50:37 -07:00
http.c Merge branch 'jc/http-clear-finished-pointer' 2022-05-31 19:10:35 -07:00
http.h
ident.c
imap-send.c Merge branch 'bc/csprng-mktemps' 2022-04-06 15:21:59 -07:00
iterator.h
json-writer.c
json-writer.h
khash.h
kwset.c tree-wide: apply equals-null.cocci 2022-05-02 09:50:37 -07:00
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 pack-objects: lazily set up "struct rev_info", don't leak 2022-03-28 09:57:21 -07:00
list-objects-filter-options.h pack-objects: lazily set up "struct rev_info", don't leak 2022-03-28 09:57:21 -07:00
list-objects-filter.c
list-objects-filter.h
list-objects.c
list-objects.h
list.h
ll-merge.c Merge branch 'ep/maint-equals-null-cocci' 2022-05-20 15:26:59 -07:00
ll-merge.h
lockfile.c
lockfile.h
log-tree.c Merge branch 'ep/maint-equals-null-cocci' 2022-05-20 15:26:59 -07:00
log-tree.h
ls-refs.c
ls-refs.h
mailinfo.c tree-wide: apply equals-null.cocci 2022-05-02 09:50:37 -07:00
mailinfo.h
mailmap.c Merge branch 'ep/maint-equals-null-cocci' 2022-05-20 15:26:59 -07:00
mailmap.h
match-trees.c
mem-pool.c
mem-pool.h
merge-blobs.c
merge-blobs.h
merge-ort-wrappers.c
merge-ort-wrappers.h
merge-ort.c Merge branch 'ep/maint-equals-null-cocci' 2022-05-20 15:26:59 -07:00
merge-ort.h
merge-recursive.c Merge branch 'ep/maint-equals-null-cocci' 2022-05-20 15:26:59 -07:00
merge-recursive.h
merge.c
mergesort.c
mergesort.h
midx.c Merge branch 'ds/midx-normalize-pathname-before-comparison' 2022-05-04 09:51:29 -07:00
midx.h
name-hash.c
notes-cache.c
notes-cache.h
notes-merge.c misc *.c: use designated initializers for struct assignments 2022-03-17 10:36:42 -07:00
notes-merge.h
notes-utils.c
notes-utils.h
notes.c
notes.h
object-file.c Merge branch 'ab/valgrind-fixes' 2022-05-23 14:39:54 -07:00
object-name.c object-name: diagnose trees in index properly 2022-04-26 13:56:39 -07:00
object-store.h object-store.h: remove unused has_sha1_file*() 2022-04-01 10:16:10 -07:00
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 'ep/maint-equals-null-cocci' 2022-05-20 15:26:59 -07:00
pack-bitmap.h
pack-check.c
pack-objects.c
pack-objects.h
pack-revindex.c
pack-revindex.h
pack-write.c
pack.h
packfile.c Merge branch 'ep/maint-equals-null-cocci' for maint-2.35 2022-05-02 10:06:04 -07:00
packfile.h
pager.c
parallel-checkout.c
parallel-checkout.h
parse-options-cb.c
parse-options.c parse-options.c: use optbug() instead of BUG() "opts" check 2022-06-02 12:51:35 -07:00
parse-options.h
patch-delta.c
patch-ids.c
patch-ids.h
path.c tree-wide: apply equals-null.cocci 2022-05-02 09:50:37 -07:00
path.h
pathspec.c
pathspec.h
pkt-line.c
pkt-line.h
preload-index.c
pretty.c
pretty.h
prio-queue.c tree-wide: apply equals-null.cocci 2022-05-02 09:50:37 -07:00
prio-queue.h
progress.c
progress.h
promisor-remote.c tree-wide: apply equals-null.cocci 2022-05-02 09:50:37 -07:00
promisor-remote.h
prompt.c
prompt.h
protocol-caps.c
protocol-caps.h
protocol.c
protocol.h
prune-packed.c
prune-packed.h
quote.c
quote.h
range-diff.c
range-diff.h
reachable.c
reachable.h
read-cache.c read-cache: set sparsity when index is new 2022-05-10 16:45:12 -07:00
rebase-interactive.c
rebase-interactive.h
rebase.c
rebase.h
ref-filter.c Merge branch 'ep/maint-equals-null-cocci' 2022-05-20 15:26:59 -07:00
ref-filter.h
reflog-walk.c
reflog-walk.h
reflog.c Merge branch 'ab/reflog-parse-options' 2022-04-04 10:56:21 -07:00
reflog.h
refs.c clone: die() instead of BUG() on bad refs 2022-04-25 11:05:28 -07:00
refs.h Revert "Merge branch 'ps/avoid-unnecessary-hook-invocation-with-packed-refs'" 2022-04-13 15:51:33 -07:00
refspec.c
refspec.h
remote-curl.c Merge branch 'rc/fetch-refetch' 2022-04-04 10:56:23 -07:00
remote.c push: default to single remote even when not named origin 2022-04-29 11:20:55 -07:00
remote.h
replace-object.c
replace-object.h
repo-settings.c compat/fsmonitor/fsm-listen-win32: stub in backend for Windows 2022-03-25 16:04:15 -07:00
repository.c
repository.h Merge branch 'jh/builtin-fsmonitor-part2' 2022-04-04 10:56:24 -07:00
rerere.c Merge branch 'ep/maint-equals-null-cocci' 2022-05-20 15:26:59 -07:00
rerere.h
reset.c
reset.h
resolve-undo.c
resolve-undo.h
revision.c Merge branch 'ep/maint-equals-null-cocci' 2022-05-20 15:26:59 -07:00
revision.h log: "--since-as-filter" option is a non-terminating "--since" variant 2022-04-23 09:36:07 -07:00
run-command.c
run-command.h run-command.h: remove always unused "clean_on_exit_handler_cbdata" 2022-04-01 10:16:03 -07:00
send-pack.c
send-pack.h
sequencer.c Merge branch 'rs/commit-summary-wo-break-rewrite' 2022-05-11 13:56:23 -07:00
sequencer.h
serve.c serve.c: remove unnecessary include 2022-04-06 09:42:12 -07:00
serve.h
server-info.c
setup.c Merge branch 'ep/maint-equals-null-cocci' 2022-05-20 15:26:59 -07:00
sh-i18n--envsubst.c tree-wide: apply equals-null.cocci 2022-05-02 09:50:37 -07:00
sha1dc_git.c
sha1dc_git.h
shallow.c Merge branch 'ep/maint-equals-null-cocci' 2022-05-20 15:26:59 -07:00
shallow.h
shared.mak Makefile: use ' ', not non-existing $(wspfx_SQ) 2022-03-21 09:03:45 -07:00
shell.c
shortlog.h
sideband.c
sideband.h
sigchain.c
sigchain.h
simple-ipc.h
sparse-index.c sparse-index: expose 'is_sparse_index_allowed()' 2022-05-10 16:45:12 -07:00
sparse-index.h sparse-index: expose 'is_sparse_index_allowed()' 2022-05-10 16:45:12 -07:00
split-index.c
split-index.h
stable-qsort.c
strbuf.c
strbuf.h
streaming.c
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 Merge branch 'pb/submodule-recurse-mode-enum' 2022-05-20 15:26:53 -07:00
submodule.c Merge branch 'jt/reset-grafts-when-resetting-shallow' 2022-03-29 12:22:03 -07:00
submodule.h Merge branch 'pb/submodule-recurse-mode-enum' 2022-05-20 15:26:53 -07:00
symlinks.c
tag.c
tag.h
tar.h
tempfile.c tempfile: add mks_tempfile_dt() 2022-04-20 16:17:33 -07:00
tempfile.h tempfile: add mks_tempfile_dt() 2022-04-20 16:17:33 -07:00
thread-utils.c
thread-utils.h
tmp-objdir.c
tmp-objdir.h
trace.c
trace.h
trace2.c common-main.c: move non-trace2 exit() behavior out of trace2.c 2022-06-02 12:51:30 -07:00
trace2.h common-main.c: move non-trace2 exit() behavior out of trace2.c 2022-06-02 12:51:30 -07:00
trailer.c Merge branch 'ep/maint-equals-null-cocci' for maint-2.35 2022-05-02 10:06:04 -07:00
trailer.h
transport-helper.c fetch: add --refetch option 2022-03-28 10:25:52 -07:00
transport-internal.h
transport.c Merge branch 'ep/maint-equals-null-cocci' 2022-05-20 15:26:59 -07:00
transport.h push: new config option "push.autoSetupRemote" supports "simple" push 2022-04-29 11:20:55 -07:00
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: preserve index sparsity 2022-05-10 16:45:13 -07:00
unpack-trees.h
upload-pack.c
upload-pack.h
url.c
url.h
urlmatch.c
urlmatch.h
usage.c bug_fl(): correctly initialize trace2 va_list 2022-06-16 13:28:22 -07:00
userdiff.c Merge branch 'jd/userdiff-kotlin' 2022-03-23 14:09:29 -07:00
userdiff.h
utf8.c
utf8.h
varint.c
varint.h
version.c
version.h
versioncmp.c
walker.c
walker.h
wildmatch.c tree-wide: apply equals-null.cocci 2022-05-02 09:50:37 -07:00
wildmatch.h
worktree.c Merge branch 'ep/maint-equals-null-cocci' 2022-05-20 15:26:59 -07:00
worktree.h
wrap-for-bin.sh
wrapper.c Merge branch 'ep/maint-equals-null-cocci' 2022-05-20 15:26:59 -07:00
write-or-die.c
ws.c
wt-status.c Merge branch 'ab/string-list-count-in-size-t' 2022-03-16 17:53:09 -07:00
wt-status.h
xdiff-interface.c Merge branch 'ep/maint-equals-null-cocci' for maint-2.35 2022-05-02 10:06:04 -07:00
xdiff-interface.h
zlib.c

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