Go to file

Jeff King d20bc01a51 avoid computing zero offsets from NULL pointer The Undefined Behavior Sanitizer in clang-11 seems to have learned a new trick: it complains about computing offsets from a NULL pointer, even if that offset is 0. This causes numerous test failures. For example, from t1090: unpack-trees.c:1355:41: runtime error: applying zero offset to null pointer ... not ok 6 - in partial clone, sparse checkout only fetches needed blobs The code in question looks like this: struct cache_entry **cache_end = cache + nr; ... while (cache != cache_end) and we sometimes pass in a NULL and 0 for "cache" and "nr". This is conceptually fine, as "cache_end" would be equal to "cache" in this case, and we wouldn't enter the loop at all. But computing even a zero offset violates the C standard. And given the fact that UBSan is noticing this behavior, this might be a potential problem spot if the compiler starts making unexpected assumptions based on undefined behavior. So let's just avoid it, which is pretty easy. In some cases we can just switch to iterating with a numeric index (as we do in sequencer.c here). In other cases (like the cache_end one) the use of an end pointer is more natural; we can keep that by just explicitly checking for the NULL/0 case when assigning the end pointer. Note that there are two ways you can write this latter case, checking for the pointer: cache_end = cache ? cache + nr : cache; or the size: cache_end = nr ? cache + nr : cache; For the case of a NULL/0 ptr/len combo, they are equivalent. But writing it the second way (as this patch does) has the property that if somebody were to incorrectly pass a NULL pointer with a non-zero length, we'd continue to notice and segfault, rather than silently pretending the length was zero. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>		2020-01-28 23:12:48 -08:00
.github	…
Documentation	Revert "Merge branch 'ra/rebase-i-more-options'"	2020-01-12 13:25:18 -08:00
block-sha1	…
builtin	Revert "Merge branch 'ra/rebase-i-more-options'"	2020-01-12 13:25:18 -08:00
ci	Merge branch 'sg/osx-force-gcc-9'	2019-12-06 15:09:21 -08:00
compat	Sync with maint	2020-01-16 15:18:46 -08:00
contrib	Sync with maint	2020-01-16 15:18:46 -08:00
ewah	…
git-gui	Merge https://github.com/prati0100/git-gui	2020-01-08 11:18:06 -08:00
gitk-git	…
gitweb	Merge branch 'do/gitweb-typofix-in-comments'	2020-01-08 12:44:11 -08:00
mergetools	…
negotiator	…
perl	…
po	l10n: zh_CN: for git v2.25.0 l10n round 1	2020-01-12 19:22:02 +08:00
ppc	…
refs	refs: pass NULL to refs_read_ref_full() because object ID is not needed	2019-12-11 13:48:42 -08:00
sha1collisiondetection@855827c583	…
sha1dc	Merge branch 'jk/lore-is-the-archive'	2019-12-06 15:09:23 -08:00
sha256	…
t	Revert "Merge branch 'ra/rebase-i-more-options'"	2020-01-12 13:25:18 -08:00
templates	…
trace2	…
vcs-svn	…
xdiff	Merge branch 'rs/xdiff-ignore-ws-w-func-context'	2019-12-16 13:08:32 -08:00
.cirrus.yml	CI: add FreeBSD CI support via Cirrus-CI	2019-12-20 12:09:12 -08:00
.clang-format	…
.editorconfig	…
.gitattributes	…
.gitignore	…
.gitmodules	…
.mailmap	.mailmap: fix erroneous authorship for Johannes Schindelin	2020-01-27 10:32:11 -08:00
.travis.yml	…
.tsan-suppressions	…
CODE_OF_CONDUCT.md	…
COPYING	…
GIT-VERSION-GEN	Git 2.25	2020-01-13 10:16:43 -08:00
INSTALL	…
LGPL-2.1	…
Makefile	Merge branch 'js/add-p-in-c'	2019-12-25 11:22:01 -08:00
README.md	…
RelNotes	Git 2.24.1	2019-12-06 16:31:40 +01:00
abspath.c	…
aclocal.m4	…
add-interactive.c	built-in add -p: implement hunk editing	2019-12-13 12:37:14 -08:00
add-interactive.h	built-in add -p: implement hunk editing	2019-12-13 12:37:14 -08:00
add-patch.c	built-in add -p: show helpful hint when nothing can be staged	2019-12-13 12:37:14 -08:00
advice.c	…
advice.h	…
alias.c	…
alias.h	…
alloc.c	…
alloc.h	…
apply.c	Merge branch 'js/add-i-a-bit-more-tests'	2019-12-16 13:08:47 -08:00
apply.h	…
archive-tar.c	…
archive-zip.c	Merge branch 'rs/archive-zip-code-cleanup'	2019-12-16 13:14:47 -08:00
archive.c	…
archive.h	…
argv-array.c	…
argv-array.h	…
attr.c	…
attr.h	…
azure-pipelines.yml	…
banned.h	…
base85.c	…
bisect.c	…
bisect.h	…
blame.c	…
blame.h	…
blob.c	…
blob.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	Merge branch 'ds/sparse-cone'	2020-01-06 14:17:51 -08:00
chdir-notify.c	…
chdir-notify.h	…
check-builtins.sh	…
check_bindir	…
checkout.c	…
checkout.h	…
color.c	…
color.h	…
column.c	…
column.h	…
combine-diff.c	…
command-list.txt	Merge branch 'ds/sparse-cone'	2019-12-25 11:21:58 -08:00
commit-graph.c	Merge branch 'ds/commit-graph-set-size-mult'	2020-01-06 14:17:51 -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	Sync with 2.23.1	2019-12-06 16:31:39 +01:00
configure.ac	…
connect.c	Sync with 2.23.1	2019-12-06 16:31:39 +01:00
connect.h	…
connected.c	…
connected.h	…
convert.c	…
convert.h	…
copy.c	…
credential-cache--daemon.c	…
credential-cache.c	…
credential-store.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	…
diff.h	Merge branch 'hw/doc-in-header'	2019-12-16 13:08:39 -08:00
diffcore-break.c	…
diffcore-delta.c	…
diffcore-order.c	…
diffcore-pickaxe.c	…
diffcore-rename.c	…
diffcore.h	…
dir-iterator.c	…
dir-iterator.h	…
dir.c	Merge branch 'en/fill-directory-fixes'	2019-12-25 11:22:02 -08:00
dir.h	Merge branch 'ds/sparse-cone'	2019-12-25 11:21:58 -08:00
editor.c	…
entry.c	…
environment.c	Merge branch 'ds/sparse-cone'	2019-12-25 11:21:58 -08:00
exec-cmd.c	…
exec-cmd.h	…
fast-import.c	Sync with 2.23.1	2019-12-06 16:31:39 +01:00
fetch-negotiator.c	…
fetch-negotiator.h	…
fetch-pack.c	…
fetch-pack.h	…
fmt-merge-msg.h	…
fsck.c	Sync with Git 2.24.1	2019-12-09 22:17:55 -08:00
fsck.h	…
fsmonitor.c	…
fsmonitor.h	…
fuzz-commit-graph.c	…
fuzz-pack-headers.c	…
fuzz-pack-idx.c	…
generate-cmdlist.sh	…
gettext.c	…
gettext.h	…
git-add--interactive.perl	git add -p: use non-zero exit code when the diff generation failed	2019-12-06 08:57:34 -08:00
git-archimport.perl	…
git-bisect.sh	…
git-compat-util.h	Sync with Git 2.24.1	2019-12-09 22:17:55 -08:00
git-cvsexportcommit.perl	…
git-cvsimport.perl	…
git-cvsserver.perl	…
git-difftool--helper.sh	…
git-filter-branch.sh	…
git-instaweb.sh	…
git-legacy-stash.sh	…
git-merge-octopus.sh	…
git-merge-one-file.sh	…
git-merge-resolve.sh	…
git-mergetool--lib.sh	…
git-mergetool.sh	…
git-p4.py	Merge branch 'bk/p4-misc-usability'	2020-01-02 12:38:29 -08:00
git-parse-remote.sh	…
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	Merge branch 'dl/submodule-set-url'	2019-12-10 13:11:42 -08:00
git-svn.perl	…
git-web--browse.sh	…
git.c	…
git.rc	…
gpg-interface.c	…
gpg-interface.h	…
graph.c	graph: fix lack of color in horizontal lines	2020-01-08 09:37:18 -08:00
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	…
interdiff.c	…
interdiff.h	…
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	Merge branch 'hi/gpg-use-check-signature'	2019-12-10 13:11:45 -08:00
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-recursive.c	merge-recursive: use subtraction to flip stage	2020-01-27 11:17:41 -08:00
merge-recursive.h	…
merge.c	…
mergesort.c	…
mergesort.h	…
midx.c	…
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	Merge branch 'dl/format-patch-notes-config-fixup'	2019-12-25 11:21:58 -08:00
notes.h	Merge branch 'dl/format-patch-notes-config-fixup'	2019-12-25 11:21:58 -08:00
object-store.h	…
object.c	…
object.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	Merge branch 'ew/packfile-syscall-optim'	2020-01-06 14:17:50 -08:00
packfile.h	…
pager.c	…
parse-options-cb.c	…
parse-options.c	…
parse-options.h	Merge branch 'hw/doc-in-header'	2019-12-16 13:08:39 -08:00
patch-delta.c	…
patch-ids.c	…
patch-ids.h	…
path.c	Sync with Git 2.24.1	2019-12-09 22:17:55 -08:00
path.h	…
pathspec.c	…
pathspec.h	Merge branch 'hw/doc-in-header'	2019-12-16 13:08:39 -08:00
pkt-line.c	…
pkt-line.h	…
preload-index.c	…
pretty.c	Merge branch 'dl/pretty-reference'	2019-12-10 13:11:43 -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.c	…
protocol.h	…
quote.c	…
quote.h	…
range-diff.c	range-diff: mark pointers as const	2019-12-06 12:34:49 -08:00
range-diff.h	Merge branch 'dl/range-diff-with-notes'	2019-12-16 13:08:46 -08:00
reachable.c	…
reachable.h	…
read-cache.c	Merge branch 'js/mingw-loosen-overstrict-tree-entry-checks'	2020-01-10 14:45:27 -08:00
rebase-interactive.c	…
rebase-interactive.h	…
ref-filter.c	…
ref-filter.h	…
reflog-walk.c	…
reflog-walk.h	…
refs.c	…
refs.h	…
refspec.c	…
refspec.h	…
remote-curl.c	…
remote-testsvn.c	…
remote.c	…
remote.h	…
replace-object.c	…
replace-object.h	…
repo-settings.c	…
repository.c	…
repository.h	…
rerere.c	…
rerere.h	…
resolve-undo.c	…
resolve-undo.h	…
revision.c	Merge branch 'dl/format-patch-notes-config-fixup'	2019-12-25 11:21:58 -08:00
revision.h	Merge branch 'dl/format-patch-notes-config-fixup'	2019-12-25 11:21:58 -08:00
run-command.c	…
run-command.h	…
send-pack.c	Merge branch 'jk/send-pack-check-negative-with-quick'	2019-12-06 15:09:22 -08:00
send-pack.h	…
sequencer.c	avoid computing zero offsets from NULL pointer	2020-01-28 23:12:48 -08:00
sequencer.h	Revert "Merge branch 'ra/rebase-i-more-options'"	2020-01-12 13:25:18 -08:00
serve.c	…
serve.h	…
server-info.c	…
setup.c	…
sh-i18n--envsubst.c	…
sha1-array.c	…
sha1-array.h	…
sha1-file.c	…
sha1-lookup.c	…
sha1-lookup.h	…
sha1-name.c	…
sha1dc_git.c	…
sha1dc_git.h	…
shallow.c	…
shell.c	…
shortlog.h	…
sideband.c	…
sideband.h	…
sigchain.c	…
sigchain.h	…
split-index.c	…
split-index.h	…
stable-qsort.c	…
strbuf.c	strbuf: add a helper function to call the editor "on an strbuf"	2019-12-13 12:37:14 -08:00
strbuf.h	strbuf: add a helper function to call the editor "on an strbuf"	2019-12-13 12:37:14 -08:00
streaming.c	…
streaming.h	…
string-list.c	…
string-list.h	…
sub-process.c	…
sub-process.h	…
submodule-config.c	fix-typo: consecutive-word duplications	2019-12-16 11:53:11 -08:00
submodule-config.h	…
submodule.c	Sync with 2.22.2	2019-12-06 16:31:30 +01:00
submodule.h	Sync with 2.22.2	2019-12-06 16:31:30 +01:00
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.h	…
trailer.c	…
trailer.h	…
transport-helper.c	Sync with 2.23.1	2019-12-06 16:31:39 +01:00
transport-internal.h	…
transport.c	…
transport.h	…
tree-diff.c	…
tree-walk.c	Merge branch 'js/mingw-loosen-overstrict-tree-entry-checks'	2020-01-06 14:17:50 -08:00
tree-walk.h	…
tree.c	…
tree.h	…
unicode-width.h	…
unimplemented.sh	…
unix-socket.c	…
unix-socket.h	…
unpack-trees.c	avoid computing zero offsets from NULL pointer	2020-01-28 23:12:48 -08:00
unpack-trees.h	…
upload-pack.c	…
upload-pack.h	…
url.c	…
url.h	…
urlmatch.c	…
urlmatch.h	…
usage.c	…
userdiff.c	Merge branch 'ln/userdiff-elixir'	2019-12-25 11:21:59 -08:00
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	avoid computing zero offsets from NULL pointer	2020-01-28 23:12:48 -08:00
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