Go to file

Jeff King c025b4b2f1 range-diff: use ssize_t for parsed "len" in read_patches() As we iterate through the buffer containing git-log output, parsing lines, we use an "int" to store the size of an individual line. This should be a size_t, as we have no guarantee that there is not a malicious 2GB+ commit-message line in the output. Overflowing this integer probably doesn't do anything _too_ terrible. We are not using the value to size a buffer, so the worst case is probably an out-of-bounds read from before the array. But it's easy enough to fix. Note that we have to use ssize_t here, since we also store the length result from parse_git_diff_header(), which may return a negative value for error. That function actually returns an int itself, which has a similar overflow problem, but I'll leave that for another day. Much of the apply.c code uses ints and should be converted as a whole; in the meantime, a negative return from parse_git_diff_header() will be interpreted as an error, and we'll bail (so we can't handle such a case, but given that it's likely to be malicious anyway, the important thing is we don't have any memory errors). Signed-off-by: Jeff King <peff@peff.net> Acked-by: Derrick Stolee <dstolee@microsoft.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>		2023-03-12 20:31:55 +01:00
.github	Merge branch 'tb/ci-run-cocci-with-18.04' into maint	2021-02-11 13:57:36 -08:00
Documentation	Git 2.30.8	2023-02-06 09:14:45 +01:00
block-sha1	…
builtin	clone: delay picking a transport until after get_repo_path()	2023-01-24 16:52:16 -08:00
ci	ci/install-depends: attempt to fix "brew cask" stuff	2021-01-14 19:08:56 -08:00
compat	Add a function to determine whether a path is owned by the current user	2022-03-21 13:16:26 +01:00
contrib	…
ewah	…
git-gui	Merge https://github.com/prati0100/git-gui	2020-12-18 15:07:10 -08:00
gitk-git	…
gitweb	…
mergetools	…
negotiator	…
perl	…
po	l10n: zh_CN: for git v2.30.0 l10n round 1 and 2	2020-12-27 19:23:27 +08:00
ppc	…
refs	refs/files-backend: don't peek into `struct lock_file`	2021-01-06 13:53:32 -08:00
sha1collisiondetection@855827c583	…
sha1dc	…
sha256	…
t	Merge branch 'ps/apply-beyond-symlink' into maint-2.30	2023-02-06 09:12:16 +01:00
templates	…
trace2	…
vcs-svn	…
xdiff	…
.cirrus.yml	…
.clang-format	…
.editorconfig	…
.gitattributes	…
.gitignore	…
.gitmodules	…
.mailmap	…
.travis.yml	…
.tsan-suppressions	…
CODE_OF_CONDUCT.md	…
COPYING	…
GIT-VERSION-GEN	Git 2.30.8	2023-02-06 09:14:45 +01:00
INSTALL	…
LGPL-2.1	…
Makefile	Merge branch 'js/skip-dashed-built-ins-from-config-mak' into maint	2021-02-05 16:31:28 -08:00
README.md	…
RelNotes	Git 2.30.8	2023-02-06 09:14:45 +01:00
abspath.c	…
aclocal.m4	…
add-interactive.c	…
add-interactive.h	…
add-patch.c	…
advice.c	…
advice.h	…
alias.c	alias.c: reject too-long cmdline strings in split_cmdline()	2022-10-01 00:23:38 -04:00
alias.h	…
alloc.c	…
alloc.h	…
apply.c	apply: fix writing behind newly created symbolic links	2023-02-03 14:41:31 -08:00
apply.h	…
archive-tar.c	…
archive-zip.c	…
archive.c	…
archive.h	…
attr.c	attr: adjust a mismatched data type	2023-01-19 13:38:06 -08:00
attr.h	attr: ignore overly large gitattributes files	2022-12-05 15:50:03 +09:00
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.c	…
bundle.h	…
cache-tree.c	…
cache-tree.h	…
cache.h	Sync with 2.29.3	2021-02-12 15:51:12 +01:00
chdir-notify.c	…
chdir-notify.h	…
check-builtins.sh	…
check_bindir	…
checkout.c	…
checkout.h	…
color.c	…
color.h	…
column.c	utf8: fix truncated string lengths in `utf8_strnwidth()`	2022-12-09 14:26:21 +09:00
column.h	…
combine-diff.c	…
command-list.txt	…
commit-graph.c	commit-graph: don't peek into `struct lock_file`	2021-01-06 13:53:32 -08:00
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	Merge branch 'rb/nonstop-config-mak-uname-update'	2020-12-18 15:15:18 -08:00
configure.ac	…
connect.c	Merge branch 'jk/forbid-lf-in-git-url' into maint	2021-02-05 16:31:27 -08:00
connect.h	…
connected.c	…
connected.h	…
convert.c	…
convert.h	…
copy.c	…
credential.c	…
credential.h	…
csum-file.c	…
csum-file.h	…
ctype.c	…
daemon.c	…
date.c	…
decorate.c	…
decorate.h	…
delta-islands.c	…
delta-islands.h	…
delta.h	…
detect-compiler	…
diff-delta.c	…
diff-lib.c	…
diff-no-index.c	…
diff.c	Merge branch 'jc/diff-I-status-fix'	2020-12-18 15:15:18 -08:00
diff.h	…
diffcore-break.c	…
diffcore-delta.c	…
diffcore-order.c	…
diffcore-pickaxe.c	…
diffcore-rename.c	…
diffcore.h	…
dir-iterator.c	dir-iterator: prevent top-level symlinks without FOLLOW_SYMLINKS	2023-01-24 16:52:16 -08:00
dir-iterator.h	dir-iterator: prevent top-level symlinks without FOLLOW_SYMLINKS	2023-01-24 16:52:16 -08:00
dir.c	…
dir.h	…
editor.c	…
entry.c	…
environment.c	…
exec-cmd.c	…
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	Merge branch 'jk/forbid-lf-in-git-url' into maint	2021-02-05 16:31:27 -08:00
fsck.h	…
fsmonitor.c	…
fsmonitor.h	…
fuzz-commit-graph.c	…
fuzz-pack-headers.c	…
fuzz-pack-idx.c	…
generate-cmdlist.sh	…
generate-configlist.sh	…
gettext.c	gettext.c: remove/reword a mostly-useless comment	2021-01-11 13:07:33 -08:00
gettext.h	…
git-add--interactive.perl	…
git-archimport.perl	…
git-bisect.sh	…
git-compat-util.h	pretty: fix integer overflow in wrapping format	2022-12-09 14:26:21 +09:00
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	Merge branch 'pb/mergetool-tool-help-fix' into maint	2021-02-05 16:31:24 -08:00
git-mergetool.sh	…
git-p4.py	Merge branch 'dl/p4-encode-after-kw-expansion' into maint	2021-02-08 14:05:54 -08:00
git-quiltimport.sh	…
git-rebase--preserve-merges.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	…
git.rc	…
gpg-interface.c	…
gpg-interface.h	…
graph.c	…
graph.h	…
grep.c	…
grep.h	…
hash.h	…
hashmap.c	…
hashmap.h	…
help.c	…
help.h	…
hex.c	…
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.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-ort.h	…
merge-recursive.c	…
merge-recursive.h	…
merge.c	…
mergesort.c	…
mergesort.h	…
midx.c	midx: don't peek into `struct lock_file`	2021-01-06 13:53:32 -08: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-store.h	…
object.c	…
object.h	…
oid-array.c	…
oid-array.h	…
oidmap.c	…
oidmap.h	…
oidset.c	…
oidset.h	…
pack-bitmap-write.c	…
pack-bitmap.c	…
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	…
packfile.h	…
pager.c	…
parse-options-cb.c	…
parse-options.c	…
parse-options.h	parse-options: format argh like error messages	2021-01-06 15:10:27 -08:00
patch-delta.c	…
patch-ids.c	Merge branch 'jk/log-cherry-pick-duplicate-patches' into maint	2021-02-05 16:31:28 -08:00
patch-ids.h	patch-ids: handle duplicate hashmap entries	2021-01-12 11:13:32 -08:00
path.c	Fix `GIT_CEILING_DIRECTORIES` with `C:\` and the likes	2022-03-24 00:21:08 +01:00
path.h	…
pathspec.c	…
pathspec.h	…
pkt-line.c	…
pkt-line.h	…
preload-index.c	…
pretty.c	pretty: restrict input lengths for padding and wrapping formats	2022-12-09 14:26:21 +09:00
pretty.h	…
prio-queue.c	…
prio-queue.h	…
progress.c	…
progress.h	…
promisor-remote.c	…
promisor-remote.h	…
prompt.c	…
prompt.h	…
protocol.c	…
protocol.h	…
prune-packed.c	…
prune-packed.h	…
quote.c	…
quote.h	…
range-diff.c	range-diff: use ssize_t for parsed "len" in read_patches()	2023-03-12 20:31:55 +01:00
range-diff.h	…
reachable.c	…
reachable.h	…
read-cache.c	read-cache: try not to peek into `struct {lock_,temp}file`	2021-01-06 13:53:32 -08:00
rebase-interactive.c	…
rebase-interactive.h	…
rebase.c	…
rebase.h	…
ref-filter.c	branch: show "HEAD detached" first under reverse sort	2021-01-07 15:13:21 -08:00
ref-filter.h	branch: sort detached HEAD based on a flag	2021-01-07 15:13:21 -08:00
reflog-walk.c	…
reflog-walk.h	…
refs.c	…
refs.h	…
refspec.c	…
refspec.h	…
remote-curl.c	…
remote.c	Merge branch 'nk/refspecs-negative-fix'	2020-12-23 13:59:46 -08:00
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	Merge branch 'jk/log-cherry-pick-duplicate-patches' into maint	2021-02-05 16:31:28 -08:00
revision.h	…
run-command.c	Sync with 2.29.3	2021-02-12 15:51:12 +01:00
run-command.h	…
send-pack.c	…
send-pack.h	…
sequencer.c	…
sequencer.h	…
serve.c	…
serve.h	…
server-info.c	…
setup.c	setup: tighten ownership checks post CVE-2022-24765	2022-06-23 12:31:05 +02:00
sh-i18n--envsubst.c	…
sha1-file.c	…
sha1-lookup.c	…
sha1-lookup.h	…
sha1-name.c	…
sha1dc_git.c	…
sha1dc_git.h	…
shallow.c	…
shallow.h	…
shell.c	shell: limit size of interactive commands	2022-10-01 00:23:38 -04:00
shortlog.h	…
sideband.c	…
sideband.h	…
sigchain.c	…
sigchain.h	…
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	…
submodule.c	…
submodule.h	…
symlinks.c	Sync with 2.20.5	2021-02-12 15:49:35 +01:00
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: make `protocol.file.allow` be "user" by default	2022-10-01 00:23:38 -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	…
unpack-trees.c	Sync with 2.28.1	2021-02-12 15:50:14 +01:00
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: refactor `strbuf_utf8_replace` to not rely on preallocated buffer	2022-12-09 14:26:21 +09:00
utf8.h	utf8: fix truncated string lengths in `utf8_strnwidth()`	2022-12-09 14:26:21 +09:00
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	branch: sort detached HEAD based on a flag	2021-01-07 15:13:21 -08:00
wt-status.h	branch: sort detached HEAD based on a flag	2021-01-07 15:13:21 -08:00
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). To subscribe to the list, send an email with just "subscribe git" in the body to majordomo@vger.kernel.org. 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