Go to file
Patrick Steinhardt ff0935b96e builtin/merge-tree: fix leaking `-X` strategy options
The `-X` switch for git-merge-tree(1) will push each option into a local
`xopts` vector that we then end up parsing. The vector never gets freed
though, causing a memory leak. Plug it.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2024-08-22 09:18:04 -07:00
.github ci: run style check on GitHub and GitLab 2024-07-23 09:56:50 -07:00
Documentation The sixth batch 2024-08-19 11:07:38 -07:00
block-sha1
builtin builtin/merge-tree: fix leaking `-X` strategy options 2024-08-22 09:18:04 -07:00
ci Merge branch 'tb/incremental-midx-part-1' 2024-08-19 11:07:37 -07:00
compat mingw(is_msys2_sh): handle forward slashes in the `sh.exe` path, too 2024-07-13 16:23:37 -07:00
contrib Merge branch 'jk/osxkeychain-username-is-nul-terminated' 2024-08-14 14:54:48 -07:00
ewah
git-gui Merge https://github.com/j6t/git-gui 2024-07-07 22:50:59 -07:00
gitk-git
gitweb Merge branch 'am/gitweb-feed-use-committer-date' 2024-07-15 10:11:41 -07:00
mergetools
negotiator refs: add referent to each_ref_fn 2024-08-09 08:47:34 -07:00
oss-fuzz Merge branch 'tb/path-filter-fix' 2024-07-08 14:53:10 -07:00
perl
po l10n: zh_CN: updated translation for 2.46 2024-07-28 19:52:41 +08:00
refs Merge branch 'sj/ref-fsck' 2024-08-16 12:51:51 -07:00
reftable Merge branch 'ps/reftable-stack-compaction' 2024-08-15 13:22:13 -07:00
sha1
sha1collisiondetection@855827c583
sha1dc
sha256
t builtin/merge-tree: fix leaking `-X` strategy options 2024-08-22 09:18:04 -07:00
templates
trace2
xdiff
.cirrus.yml
.clang-format Merge branch 'rs/unit-tests-test-run' 2024-08-19 11:07:36 -07:00
.editorconfig
.gitattributes
.gitignore
.gitlab-ci.yml check-whitespace: detect if no base_commit is provided 2024-07-23 09:56:50 -07:00
.gitmodules
.mailmap
.tsan-suppressions
CODE_OF_CONDUCT.md
COPYING
GIT-VERSION-GEN Prepare for 2.46.1 2024-08-16 12:52:53 -07:00
INSTALL
LGPL-2.1
Makefile Merge branch 'gt/unit-test-hashmap' 2024-08-15 13:22:12 -07:00
README.md
RelNotes Prepare for 2.46.1 2024-08-16 12:52:53 -07:00
SECURITY.md
abspath.c
abspath.h
aclocal.m4
add-interactive.c
add-interactive.h
add-patch.c Merge branch 'pw/add-patch-with-suppress-blank-empty' into maint-2.46 2024-08-16 12:50:54 -07:00
advice.c Merge branch 'ds/advice-sparse-index-expansion' 2024-07-16 11:18:56 -07:00
advice.h Merge branch 'ds/advice-sparse-index-expansion' 2024-07-16 11:18:56 -07:00
alias.c
alias.h
alloc.c
alloc.h
apply.c Merge branch 'jk/apply-patch-mode-check-fix' 2024-08-14 14:54:50 -07:00
apply.h Merge branch 'ps/leakfixes-more' 2024-07-08 14:53:10 -07:00
archive-tar.c
archive-zip.c
archive.c
archive.h
attr.c Merge branch 'ps/use-the-repository' 2024-07-02 09:59:00 -07:00
attr.h
banned.h
base85.c
base85.h
bisect.c refs: add referent to each_ref_fn 2024-08-09 08:47:34 -07:00
bisect.h
blame.c Merge branch 'ps/leakfixes-more' 2024-07-08 14:53:10 -07:00
blame.h
blob.c
blob.h
bloom.c Merge branch 'tb/path-filter-fix' 2024-07-08 14:53:10 -07:00
bloom.h
branch.c
branch.h
builtin.h
bulk-checkin.c bulk-checkin: fix leaking state TODO 2024-08-14 10:07:57 -07:00
bulk-checkin.h
bundle-uri.c Merge branch 'xx/bundie-uri-fixes' 2024-07-08 14:53:11 -07:00
bundle-uri.h
bundle.c Merge branch 'xx/bundie-uri-fixes' 2024-07-08 14:53:11 -07:00
bundle.h
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
command-list.txt
commit-graph.c refs: add referent to each_ref_fn 2024-08-09 08:47:34 -07:00
commit-graph.h
commit-reach.c commit-reach: fix trivial memory leak when computing reachability 2024-08-01 08:47:38 -07:00
commit-reach.h
commit-slab-decl.h
commit-slab-impl.h
commit-slab.h
commit.c Merge branch 'ps/leakfixes-more' 2024-07-08 14:53:10 -07:00
commit.h Merge branch 'ps/leakfixes-more' 2024-07-08 14:53:10 -07:00
common-main.c
config.c Merge branch 'ps/leakfixes-part-4' into ps/leakfixes-part-5 2024-08-20 10:15:27 -07:00
config.h
config.mak.dev Merge branch 'tb/dev-build-pedantic-fix' 2024-07-15 10:11:42 -07:00
config.mak.in
config.mak.uname config.mak.uname: remove unused uname_P variable 2024-07-18 07:01:39 -07:00
configure.ac
connect.c
connect.h
connected.c
connected.h
convert.c convert: fix leaks when resetting attributes 2024-08-22 09:18:03 -07:00
convert.h
copy.c
copy.h
credential.c
credential.h
csum-file.c Merge branch 'ps/leakfixes-part-4' into ps/leakfixes-part-5 2024-08-20 10:15:27 -07:00
csum-file.h Merge branch 'ps/leakfixes-part-4' into ps/leakfixes-part-5 2024-08-20 10:15:27 -07:00
ctype.c
daemon.c
date.c
date.h
decorate.c
decorate.h
delta-islands.c refs: add referent to each_ref_fn 2024-08-09 08:47:34 -07:00
delta-islands.h
delta.h
detect-compiler
diagnose.c
diagnose.h
diff-delta.c
diff-lib.c Merge branch 'ps/leakfixes-more' 2024-07-08 14:53:10 -07:00
diff-merges.c
diff-merges.h
diff-no-index.c
diff.c diff: free state populated via options 2024-08-14 10:08:01 -07:00
diff.h
diffcore-break.c
diffcore-delta.c
diffcore-order.c
diffcore-pickaxe.c
diffcore-rename.c Merge branch 'ps/use-the-repository' 2024-07-02 09:59:00 -07:00
diffcore-rotate.c
diffcore.h
dir-iterator.c
dir-iterator.h
dir.c win32: override `fspathcmp()` with a directory separator-aware version 2024-07-13 16:23:36 -07:00
dir.h win32: override `fspathcmp()` with a directory separator-aware version 2024-07-13 16:23:36 -07:00
editor.c
editor.h
entry.c entry: fix leaking pathnames during delayed checkout 2024-08-01 08:47:37 -07:00
entry.h
environment.c config: fix leaking comment character config 2024-08-14 10:07:58 -07:00
environment.h config: fix leaking comment character config 2024-08-14 10:07:58 -07:00
exec-cmd.c
exec-cmd.h
fetch-negotiator.c
fetch-negotiator.h
fetch-pack.c refs: add referent to each_ref_fn 2024-08-09 08:47:34 -07:00
fetch-pack.h
fmt-merge-msg.c Merge branch 'ps/use-the-repository' 2024-07-02 09:59:00 -07:00
fmt-merge-msg.h
fsck.c builtin/refs: add verify subcommand 2024-08-08 09:36:53 -07:00
fsck.h fsck: add ref name check for files backend 2024-08-08 09:36:53 -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
generate-hooklist.sh
gettext.c
gettext.h
git-archimport.perl
git-compat-util.h win32: override `fspathcmp()` with a directory separator-aware version 2024-07-13 16:23:36 -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
git-mergetool.sh
git-p4.py
git-quiltimport.sh
git-request-pull.sh
git-send-email.perl Merge branch 'cb/send-email-sanitize-trailer-addresses' 2024-07-16 11:18:56 -07:00
git-sh-i18n.sh
git-sh-setup.sh
git-submodule.sh builtin/submodule: allow "add" to use different ref storage format 2024-08-08 09:22:21 -07:00
git-svn.perl
git-web--browse.sh
git-zlib.c
git-zlib.h
git.c git: fix leaking system paths 2024-08-14 10:07:56 -07:00
git.rc
gpg-interface.c
gpg-interface.h
graph.c
graph.h
grep.c grep: -W: skip trailing empty lines at EOF, too 2024-07-30 09:59:04 -07:00
grep.h
hash-lookup.c
hash-lookup.h
hash.h
hashmap.c
hashmap.h
help.c refs: add referent to each_ref_fn 2024-08-09 08:47:34 -07:00
help.h
hex-ll.c
hex-ll.h
hex.c
hex.h
hook.c
hook.h
http-backend.c refs: add referent to each_ref_fn 2024-08-09 08:47:34 -07:00
http-fetch.c
http-push.c
http-walker.c
http.c http: do not ignore proxy path 2024-08-02 08:30:08 -07:00
http.h
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 Merge branch 'ps/leakfixes-more' 2024-07-08 14:53:10 -07:00
list-objects-filter.h
list-objects.c
list-objects.h
list.h
lockfile.c
lockfile.h
log-tree.c Merge branch 'jc/refs-symref-referent' 2024-08-15 13:22:15 -07:00
log-tree.h
loose.c
loose.h
ls-refs.c refs: add referent to each_ref_fn 2024-08-09 08:47:34 -07:00
ls-refs.h
mailinfo.c mailinfo: fix leaking header data 2024-08-22 09:18:03 -07:00
mailinfo.h
mailmap.c mailmap: plug memory leak in read_mailmap_blob() 2024-07-26 08:00:09 -07:00
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: unconditionally release attributes index 2024-08-14 10:08:00 -07:00
merge-ort.h Merge branch 'ps/leakfixes-more' 2024-07-08 14:53:10 -07:00
merge-recursive.c merge-recursive: honor diff.algorithm 2024-07-13 18:10:49 -07:00
merge-recursive.h merge-recursive: honor diff.algorithm 2024-07-13 18:10:49 -07:00
merge.c
merge.h
mergesort.h
midx-write.c Merge branch 'tb/incremental-midx-part-1' 2024-08-19 11:07:37 -07:00
midx.c midx: implement support for writing incremental MIDX chains 2024-08-06 12:01:39 -07:00
midx.h midx: implement support for writing incremental MIDX chains 2024-08-06 12:01:39 -07:00
name-hash.c
name-hash.h
notes-cache.c
notes-cache.h
notes-merge.c Merge branch 'ps/leakfixes-more' 2024-07-08 14:53:10 -07:00
notes-merge.h
notes-utils.c Merge branch 'ps/leakfixes-more' 2024-07-08 14:53:10 -07:00
notes-utils.h
notes.c refs: add referent to each_ref_fn 2024-08-09 08:47:34 -07:00
notes.h
object-file-convert.c
object-file-convert.h
object-file.c Merge branch 'ps/leakfixes-part-4' into ps/leakfixes-part-5 2024-08-20 10:15:27 -07:00
object-file.h
object-name.c Merge branch 'ps/leakfixes-part-4' into ps/leakfixes-part-5 2024-08-20 10:15:27 -07:00
object-name.h
object-store-ll.h
object-store.h
object.c object: fix leaking packfiles when closing object store 2024-08-08 09:22:21 -07:00
object.h Merge branch 'tb/path-filter-fix' 2024-07-08 14:53:10 -07:00
oid-array.c
oid-array.h
oidmap.c
oidmap.h
oidset.c
oidset.h
oidtree.c
oidtree.h
pack-bitmap-write.c Merge branch 'ps/use-the-repository' 2024-07-02 09:59:00 -07:00
pack-bitmap.c Merge branch 'ps/use-the-repository' 2024-07-02 09:59:00 -07:00
pack-bitmap.h
pack-check.c
pack-mtimes.c
pack-mtimes.h
pack-objects.c
pack-objects.h
pack-revindex.c Merge branch 'ps/use-the-repository' 2024-07-02 09:59:00 -07:00
pack-revindex.h
pack-write.c
pack.h
packfile.c midx: implement support for writing incremental MIDX chains 2024-08-06 12:01:39 -07:00
packfile.h midx: implement support for writing incremental MIDX chains 2024-08-06 12:01:39 -07:00
pager.c pager: introduce wait_for_pager 2024-07-25 09:03:00 -07:00
pager.h pager: introduce wait_for_pager 2024-07-25 09:03:00 -07:00
parallel-checkout.c
parallel-checkout.h
parse-options-cb.c Merge branch 'ps/use-the-repository' 2024-07-02 09:59:00 -07:00
parse-options.c
parse-options.h
parse.c
parse.h
patch-delta.c
patch-ids.c
patch-ids.h
path.c
path.h
pathspec.c
pathspec.h Merge branch 'as/pathspec-h-typofix' 2024-07-12 08:41:57 -07:00
pkt-line.c
pkt-line.h
preload-index.c
preload-index.h
pretty.c pretty: fix leaking key/value separator buffer 2024-08-22 09:18:04 -07: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 refs: add referent to each_ref_fn 2024-08-09 08:47:34 -07:00
pseudo-merge.h
quote.c
quote.h
range-diff.c userdiff: fix leaking memory for configured diff drivers 2024-08-14 10:08:01 -07:00
range-diff.h
reachable.c refs: add referent to each_ref_fn 2024-08-09 08:47:34 -07:00
reachable.h
read-cache-ll.h
read-cache.c read-cache: fix leaking hashfile when writing index fails 2024-08-14 10:07:58 -07:00
read-cache.h
rebase-interactive.c Merge branch 'ps/use-the-repository' 2024-07-02 09:59:00 -07:00
rebase-interactive.h
rebase.c
rebase.h
ref-filter.c Merge branch 'jc/refs-symref-referent' 2024-08-15 13:22:15 -07:00
ref-filter.h
reflog-walk.c
reflog-walk.h
reflog.c Merge branch 'jc/refs-symref-referent' 2024-08-15 13:22:15 -07:00
reflog.h
refs.c Merge branch 'sj/ref-fsck' 2024-08-16 12:51:51 -07:00
refs.h Merge branch 'sj/ref-fsck' 2024-08-16 12:51:51 -07:00
refspec.c Merge branch 'ps/use-the-repository' 2024-07-02 09:59:00 -07:00
refspec.h
remote-curl.c Merge branch 'jk/remote-wo-url' 2024-07-02 09:59:01 -07:00
remote.c Merge branch 'ps/leakfixes-part-4' into ps/leakfixes-part-5 2024-08-20 10:15:27 -07:00
remote.h Merge branch 'jk/remote-wo-url' 2024-07-02 09:59:01 -07:00
replace-object.c refs: add referent to each_ref_fn 2024-08-09 08:47:34 -07:00
replace-object.h
repo-settings.c Merge branch 'tb/path-filter-fix' 2024-07-08 14:53:10 -07:00
repository.c
repository.h Merge branch 'tb/path-filter-fix' 2024-07-08 14:53:10 -07:00
rerere.c builtin/rerere: fix various trivial memory leaks 2024-08-01 08:47:37 -07:00
rerere.h
reset.c
reset.h
resolve-undo.c
resolve-undo.h
revision.c refs: add referent to each_ref_fn 2024-08-09 08:47:34 -07:00
revision.h
run-command.c run-command: declare the `git_shell_path()` function globally 2024-07-13 16:23:37 -07:00
run-command.h run-command: declare the `git_shell_path()` function globally 2024-07-13 16:23:37 -07:00
sane-ctype.h
scalar.c Merge branch 'ps/use-the-repository' 2024-07-02 09:59:00 -07:00
send-pack.c Merge branch 'jc/disable-push-nego-for-deletion' 2024-07-15 10:11:43 -07:00
send-pack.h
sequencer.c sequencer: release todo list on error paths 2024-08-14 10:08:00 -07:00
sequencer.h Merge branch 'pw/rebase-i-error-message' into maint-2.45 2024-07-02 09:27:56 -07:00
serve.c
serve.h
server-info.c refs: add referent to each_ref_fn 2024-08-09 08:47:34 -07:00
server-info.h
setup.c safe.directory: normalize the configured path 2024-07-30 11:47:59 -07:00
setup.h
sh-i18n--envsubst.c
sha1dc_git.c
sha1dc_git.h
shallow.c refs: add referent to each_ref_fn 2024-08-09 08:47:34 -07:00
shallow.h
shared.mak
shell.c
shortlog.h
sideband.c
sideband.h
sigchain.c
sigchain.h
simple-ipc.h
sparse-index.c Merge branch 'ds/advice-sparse-index-expansion' 2024-07-16 11:18:56 -07:00
sparse-index.h
split-index.c
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: declare the `strvec_push_nodup()` function globally 2024-07-13 16:23:36 -07:00
strvec.h strvec: declare the `strvec_push_nodup()` function globally 2024-07-13 16:23:36 -07:00
sub-process.c
sub-process.h
submodule-config.c submodule-config: fix leaking name entry when traversing submodules 2024-08-14 10:07:58 -07:00
submodule-config.h
submodule.c Merge branch 'jc/refs-symref-referent' 2024-08-15 13:22:15 -07: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
trailer.h
transport-helper.c
transport-internal.h
transport.c transport: fix leak with transport helper URLs 2024-08-07 17:38:31 -07:00
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: clear index when not propagating it 2024-08-14 10:08:00 -07:00
unpack-trees.h
upload-pack.c refs: add referent to each_ref_fn 2024-08-09 08:47:34 -07:00
upload-pack.h
url.c
url.h
urlmatch.c
urlmatch.h
usage.c
userdiff.c userdiff: fix leaking memory for configured diff drivers 2024-08-14 10:08:01 -07:00
userdiff.h userdiff: fix leaking memory for configured diff drivers 2024-08-14 10:08:01 -07:00
utf8.c
utf8.h
varint.c
varint.h
version.c
version.h
versioncmp.c
versioncmp.h
walker.c refs: add referent to each_ref_fn 2024-08-09 08:47:34 -07:00
walker.h
wildmatch.c
wildmatch.h
worktree.c refs: add referent to each_ref_fn 2024-08-09 08:47:34 -07:00
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 Merge branch 'ps/use-the-repository' 2024-07-02 09:59:00 -07:00
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