A fork of Git containing Microsoft-specific patches.

Перейти к файлу

Ævar Arnfjörð Bjarmason f1f4ebf432 sequencer.c: fix "opts->strategy" leak in read_strategy_opts() When "read_strategy_opts()" is called we may have populated the "opts->strategy" before, so we'll need to free() it to avoid leaking memory. We populate it before because we cal get_replay_opts() from within "rebase.c" with an already populated "opts", which we then copy. Then if we're doing a "rebase -i" the sequencer API itself will promptly clobber our alloc'd version of it with its own. If this code is changed to do, instead of the added free() here a: if (opts->strategy) opts->strategy = xstrdup("another leak"); We get a couple of stacktraces from -fsanitize=leak showing how we ended up clobbering the already allocated value, i.e.: Direct leak of 6 byte(s) in 1 object(s) allocated from: #0 0x7f2e8cd45545 in __interceptor_malloc ../../../../src/libsanitizer/lsan/lsan_interceptors.cpp:75 #1 0x7f2e8cb0fcaa in __GI___strdup string/strdup.c:42 #2 0x6c4778 in xstrdup wrapper.c:39 #3 0x66bcb8 in read_strategy_opts sequencer.c:2902 #4 0x66bf7b in read_populate_opts sequencer.c:2969 #5 0x6723f9 in sequencer_continue sequencer.c:5063 #6 0x4a4f74 in run_sequencer_rebase builtin/rebase.c:348 #7 0x4a64c8 in run_specific_rebase builtin/rebase.c:753 #8 0x4a9b8b in cmd_rebase builtin/rebase.c:1824 #9 0x407a32 in run_builtin git.c:466 #10 0x407e0a in handle_builtin git.c:721 #11 0x40803d in run_argv git.c:788 #12 0x40850f in cmd_main git.c:923 #13 0x4eee79 in main common-main.c:57 #14 0x7f2e8ca9f209 in __libc_start_call_main ../sysdeps/nptl/libc_start_call_main.h:58 #15 0x7f2e8ca9f2bb in __libc_start_main_impl ../csu/libc-start.c:389 #16 0x405fd0 in _start (git+0x405fd0) Direct leak of 4 byte(s) in 1 object(s) allocated from: #0 0x7f2e8cd45545 in __interceptor_malloc ../../../../src/libsanitizer/lsan/lsan_interceptors.cpp:75 #1 0x7f2e8cb0fcaa in __GI___strdup string/strdup.c:42 #2 0x6c4778 in xstrdup wrapper.c:39 #3 0x4a3c31 in xstrdup_or_null git-compat-util.h:1169 #4 0x4a447a in get_replay_opts builtin/rebase.c:163 #5 0x4a4f5b in run_sequencer_rebase builtin/rebase.c:346 #6 0x4a64c8 in run_specific_rebase builtin/rebase.c:753 #7 0x4a9b8b in cmd_rebase builtin/rebase.c:1824 #8 0x407a32 in run_builtin git.c:466 #9 0x407e0a in handle_builtin git.c:721 #10 0x40803d in run_argv git.c:788 #11 0x40850f in cmd_main git.c:923 #12 0x4eee79 in main common-main.c:57 #13 0x7f2e8ca9f209 in __libc_start_call_main ../sysdeps/nptl/libc_start_call_main.h:58 #14 0x7f2e8ca9f2bb in __libc_start_main_impl ../csu/libc-start.c:389 #15 0x405fd0 in _start (git+0x405fd0) This can be seen in e.g. the 4th test of "t3404-rebase-interactive.sh". In the larger picture the ownership of the "struct replay_opts" is quite a mess, e.g. in this case rebase.c's static "get_replay_opts()" function partially creates it, but nothing in rebase.c will free() it. The structure is "mostly owned" by the sequencer API, but it also expects to get these partially populated versions of it. It would be better to have rebase keep track of what it allocated, and free() that, and to pass that as a "const" to the sequencer API, which would copy what it needs to its own version, and to free() that. But doing so is a much larger change, and however messy the ownership boundary is here is consistent with what we're doing already, so let's just free() this to fix the leak. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Taylor Blau <me@ttaylorr.com>		2022-11-21 12:32:48 +09:00
.github	ci: add address and undefined sanitizer tasks	2022-10-20 09:20:59 -07:00
Documentation	The tenth batch	2022-11-03 20:41:55 -04:00
block-sha1	…
builtin	ls-files: fix a --with-tree memory leak	2022-11-21 12:32:48 +09:00
ci	Merge branch 'jc/more-sanitizer-at-ci'	2022-10-25 17:11:44 -07:00
compat	Merge branch 'jk/unused-anno-more'	2022-10-27 14:51:52 -07:00
contrib	Merge branch 'pb/subtree-split-and-merge-after-squashing-tag-fix'	2022-10-30 21:04:43 -04:00
ewah	…
git-gui	…
gitk-git	…
gitweb	…
mergetools	…
negotiator	negotiator/skipping: avoid stack overflow	2022-10-25 17:14:40 -07:00
oss-fuzz	Merge branch 'ac/fuzzers'	2022-10-07 17:19:59 -07:00
perl	Git.pm: trust rev-parse to find bare repositories	2022-10-22 16:39:48 -07:00
po	…
refs	…
reftable	…
sha1collisiondetection@855827c583	…
sha1dc	…
sha256	…
t	ls-files: fix a --with-tree memory leak	2022-11-21 12:32:48 +09:00
templates	…
trace2	trace2: add global counter mechanism	2022-10-24 12:45:26 -07:00
xdiff	…
.cirrus.yml	…
.clang-format	…
.editorconfig	…
.gitattributes	…
.gitignore	Merge branch 'js/cmake-updates'	2022-10-27 14:51:53 -07:00
.gitmodules	…
.mailmap	…
.tsan-suppressions	…
CODE_OF_CONDUCT.md	…
COPYING	…
GIT-VERSION-GEN	Start 2.39 cycle	2022-10-07 17:19:59 -07:00
INSTALL	…
LGPL-2.1	…
Makefile	Merge branch 'ds/bundle-uri-3'	2022-10-30 21:04:44 -04:00
README.md	…
RelNotes	Downmerge a handful of topics for 2.38.2	2022-10-25 17:11:39 -07:00
SECURITY.md	…
abspath.c	…
aclocal.m4	…
add-interactive.c	…
add-interactive.h	…
add-patch.c	add -p: avoid ambiguous signed/unsigned comparison	2022-10-19 11:55:28 -07:00
advice.c	…
advice.h	…
alias.c	…
alias.h	…
alloc.c	…
alloc.h	…
apply.c	Merge branch 'tb/cap-patch-at-1gb'	2022-10-30 21:04:43 -04:00
apply.h	…
archive-tar.c	…
archive-zip.c	…
archive.c	Merge branch 'rs/archive-dedup-printf' into maint-2.38	2022-10-27 15:24:14 -07:00
archive.h	…
attr.c	…
attr.h	…
banned.h	…
base85.c	…
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	…
bulk-checkin.h	…
bundle-uri.c	bundle-uri: suppress stderr from remote-https	2022-10-12 09:13:25 -07:00
bundle-uri.h	bundle-uri: fetch a list of bundles	2022-10-12 09:13:25 -07:00
bundle.c	bundle-uri: quiet failed unbundlings	2022-10-12 09:13:25 -07:00
bundle.h	Merge branch 'ds/bundle-uri-3'	2022-10-30 21:04:44 -04:00
cache-tree.c	…
cache-tree.h	…
cache.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	…
commit-graph.h	…
commit-reach.c	…
commit-reach.h	…
commit-slab-decl.h	…
commit-slab-impl.h	…
commit-slab.h	…
commit.c	Merge branch 'pw/rebase-keep-base-fixes'	2022-10-30 21:04:42 -04:00
commit.h	rebase: be stricter when reading state files containing oids	2022-10-17 11:53:00 -07:00
common-main.c	…
config.c	Merge branch 'ds/bundle-uri-3'	2022-10-30 21:04:44 -04:00
config.h	bundle-uri: create base key-value pair parsing	2022-10-12 09:13:24 -07:00
config.mak.dev	config.mak.dev: disable suggest braces error on old clang versions	2022-10-10 11:15:31 -07:00
config.mak.in	…
config.mak.uname	…
configure.ac	…
connect.c	…
connect.h	…
connected.c	…
connected.h	…
convert.c	convert: mark unused parameter in null stream filter	2022-10-17 21:24:04 -07:00
convert.h	…
copy.c	…
credential.c	…
credential.h	…
csum-file.c	…
csum-file.h	…
ctype.c	…
daemon.c	…
date.c	date: mark unused parameters in handler functions	2022-10-17 21:24:04 -07: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	…
diff-merges.c	…
diff-merges.h	…
diff-no-index.c	…
diff.c	Merge branch 'jz/patch-id'	2022-10-30 21:04:41 -04:00
diff.h	patch-id: use stable patch-id for rebases	2022-10-24 15:44:19 -07:00
diffcore-break.c	…
diffcore-delta.c	…
diffcore-order.c	…
diffcore-pickaxe.c	diffcore-pickaxe: mark unused parameters in pickaxe functions	2022-10-17 21:24:04 -07:00
diffcore-rename.c	…
diffcore-rotate.c	…
diffcore.h	…
dir-iterator.c	…
dir-iterator.h	…
dir.c	dir.c: free "ident" and "exclude_per_dir" in "struct untracked_cache"	2022-11-21 12:32:48 +09:00
dir.h	dir.c: free "ident" and "exclude_per_dir" in "struct untracked_cache"	2022-11-21 12:32:48 +09:00
editor.c	…
entry.c	…
entry.h	…
environment.c	…
environment.h	…
exec-cmd.c	mark unused parameters in trivial compat functions	2022-10-17 21:24:03 -07:00
exec-cmd.h	…
fetch-negotiator.c	…
fetch-negotiator.h	…
fetch-pack.c	…
fetch-pack.h	…
fmt-merge-msg.c	…
fmt-merge-msg.h	…
fsck.c	…
fsck.h	fsck: document msg-id	2022-10-25 15:44:18 -07:00
fsmonitor--daemon.h	…
fsmonitor-ipc.c	…
fsmonitor-ipc.h	…
fsmonitor-path-utils.h	…
fsmonitor-settings.c	…
fsmonitor-settings.h	…
fsmonitor.c	fsmonitor: fix leak of warning message	2022-10-10 22:16:56 -07:00
fsmonitor.h	…
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	Merge branch 'ab/unused-annotation' into maint-2.38	2022-10-27 15:24:12 -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	…
git-sh-i18n.sh	…
git-sh-setup.sh	…
git-submodule.sh	…
git-svn.perl	…
git-web--browse.sh	…
git.c	Merge branch 'ds/cmd-main-reorder'	2022-10-21 11:37:29 -07:00
git.rc	…
gpg-interface.c	Merge branch 'pw/ssh-sign-report-errors' into maint-2.38	2022-10-25 17:11:35 -07:00
gpg-interface.h	…
graph.c	…
graph.h	…
grep.c	Merge branch 'ab/grep-simplify-extended-expression'	2022-10-21 11:37:28 -07:00
grep.h	Merge branch 'ab/grep-simplify-extended-expression'	2022-10-21 11:37:28 -07:00
hash-lookup.c	…
hash-lookup.h	…
hash.h	…
hashmap.c	…
hashmap.h	…
help.c	Merge branch 'ab/doc-synopsis-and-cmd-usage'	2022-10-28 11:26:54 -07:00
help.h	…
hex.c	…
hook.c	run-command API: have run_process_parallel() take an "opts" struct	2022-10-12 14:12:41 -07:00
hook.h	…
http-backend.c	…
http-fetch.c	…
http-push.c	…
http-walker.c	…
http.c	…
http.h	…
ident.c	…
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	…
list-objects.h	…
list.h	…
ll-merge.c	ll-merge: mark unused parameters in callbacks	2022-10-17 21:24:04 -07:00
ll-merge.h	…
lockfile.c	…
lockfile.h	…
log-tree.c	…
log-tree.h	…
ls-refs.c	…
ls-refs.h	…
mailinfo.c	…
mailinfo.h	…
mailmap.c	…
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 'en/ort-dir-rename-and-symlink-fix'	2022-10-30 21:04:43 -04:00
merge-ort.h	…
merge-recursive.c	…
merge-recursive.h	…
merge.c	…
mergesort.h	…
midx.c	Merge branch 'tb/midx-bitmap-selection-fix'	2022-10-27 14:51:52 -07:00
midx.h	…
name-hash.c	…
notes-cache.c	…
notes-cache.h	…
notes-merge.c	…
notes-merge.h	…
notes-utils.c	…
notes-utils.h	…
notes.c	…
notes.h	…
object-file.c	Merge branch 'jk/unused-anno-more'	2022-10-27 14:51:52 -07:00
object-name.c	…
object-store.h	…
object.c	Merge branch 'jk/fsck-on-diet' into maint-2.38	2022-10-25 17:11:33 -07:00
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-write.c: instrument number of reused bitmaps	2022-10-13 13:35:08 -07:00
pack-bitmap.c	…
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.h	…
pager.c	…
parallel-checkout.c	…
parallel-checkout.h	…
parse-options-cb.c	…
parse-options.c	…
parse-options.h	…
patch-delta.c	…
patch-ids.c	Merge branch 'jz/patch-id'	2022-10-30 21:04:41 -04:00
patch-ids.h	patch-id: use stable patch-id for rebases	2022-10-24 15:44:19 -07:00
path.c	…
path.h	…
pathspec.c	…
pathspec.h	…
pkt-line.c	…
pkt-line.h	…
preload-index.c	…
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	…
prune-packed.h	…
quote.c	…
quote.h	…
range-diff.c	…
range-diff.h	…
reachable.c	…
reachable.h	…
read-cache.c	read-cache.c: clear and free "sparse_checkout_patterns"	2022-11-21 12:32:48 +09:00
rebase-interactive.c	…
rebase-interactive.h	…
rebase.c	…
rebase.h	…
ref-filter.c	built-ins & libs & helpers: add/move destructors, fix leaks	2022-11-21 12:32:48 +09:00
ref-filter.h	…
reflog-walk.c	string-list: mark unused callback parameters	2022-10-17 21:24:04 -07:00
reflog-walk.h	…
reflog.c	…
reflog.h	…
refs.c	…
refs.h	…
refspec.c	…
refspec.h	…
remote-curl.c	…
remote.c	…
remote.h	…
replace-object.c	…
replace-object.h	…
repo-settings.c	…
repository.c	…
repository.h	…
rerere.c	…
rerere.h	…
reset.c	…
reset.h	…
resolve-undo.c	…
resolve-undo.h	…
revision.c	revision API: call graph_clear() in release_revisions()	2022-11-21 12:32:48 +09:00
revision.h	…
run-command.c	run-command.c: remove "max_processes", add "const" to signal() handler	2022-10-12 14:12:42 -07:00
run-command.h	run-command API: move *_tr2() users to "run_processes_parallel()"	2022-10-12 14:12:41 -07:00
scalar.c	…
send-pack.c	…
send-pack.h	…
sequencer.c	sequencer.c: fix "opts->strategy" leak in read_strategy_opts()	2022-11-21 12:32:48 +09:00
sequencer.h	sequencer: stop exporting GIT_REFLOG_ACTION	2022-11-09 18:15:43 -05:00
serve.c	…
serve.h	…
server-info.c	…
setup.c	…
sh-i18n--envsubst.c	…
sha1dc_git.c	…
sha1dc_git.h	…
shallow.c	…
shallow.h	…
shared.mak	…
shell.c	…
shortlog.h	shortlog: extract `shortlog_finish_setup()`	2022-10-24 14:48:05 -07:00
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	…
strbuf.c	…
strbuf.h	…
streaming.c	…
streaming.h	…
string-list.c	string-list: mark unused callback parameters	2022-10-17 21:24:04 -07:00
string-list.h	…
strmap.c	…
strmap.h	…
strvec.c	…
strvec.h	…
sub-process.c	…
sub-process.h	…
submodule-config.c	run-command API: don't fall back on online_cpus()	2022-10-12 14:12:41 -07:00
submodule-config.h	…
submodule.c	Merge branch 'rs/absorb-git-dir-simplify'	2022-10-30 21:04:42 -04:00
submodule.h	…
symlinks.c	…
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: add global counter mechanism	2022-10-24 12:45:26 -07:00
trace2.h	trace2: add global counter mechanism	2022-10-24 12:45:26 -07:00
trailer.c	…
trailer.h	…
transport-helper.c	…
transport-internal.h	…
transport.c	Merge branch 'ds/bundle-uri-3'	2022-10-30 21:04:44 -04: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.h	…
upload-pack.c	…
upload-pack.h	…
url.c	…
url.h	…
urlmatch.c	…
urlmatch.h	…
usage.c	…
userdiff.c	…
userdiff.h	…
utf8.c	…
utf8.h	…
varint.c	…
varint.h	…
version.c	…
version.h	…
versioncmp.c	…
walker.c	…
walker.h	…
wildmatch.c	…
wildmatch.h	…
worktree.c	…
worktree.h	…
wrap-for-bin.sh	…
wrapper.c	…
write-or-die.c	…
ws.c	…
wt-status.c	…
wt-status.h	…
xdiff-interface.c	…
xdiff-interface.h	…
zlib.c	…

README.md

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