1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-01 06:47:52 +01:00
Find a file
René Scharfe fb04dced9c tree-diff: don't access hash of NULL object_id pointer
The object_id pointers can be NULL for invalid entries.  Don't try to
dereference them and pass NULL along to fill_tree_descriptor() instead,
which handles them just fine.

Found with Clang's UBSan.

Signed-off-by: Rene Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-07-17 14:49:36 -07:00
block-sha1
builtin builtin/diff-tree: cleanup references to sha1 2017-06-05 11:23:58 +09:00
ci Merge branch 'ls/travis-relays-for-windows-ci' 2017-05-23 13:46:04 +09:00
compat winansi: avoid buffer overrun 2017-05-08 12:18:19 +09:00
contrib Merge branch 'tg/stash-push-fixup' 2017-05-29 12:34:52 +09:00
Documentation Fourth batch for 2.14 2017-05-30 11:20:10 +09:00
ewah Merge branch 'jk/ewah-use-right-type-in-sizeof' into maint 2017-03-21 15:03:24 -07:00
git-gui Fix build with core.autocrlf=true 2017-05-10 13:32:50 +09:00
gitk-git
gitweb doc: use https links to Wikipedia to avoid http redirects 2017-05-15 13:04:54 +09:00
mergetools
perl
po Merge branch 'master' of git://github.com/nafmo/git-l10n-sv 2017-05-09 22:12:34 +08:00
ppc
refs Merge branch 'bc/object-id' 2017-05-29 12:34:43 +09:00
sha1dc sha1dc: avoid CPP macro collisions 2017-03-26 15:34:44 -07:00
t Merge branch 'dt/unpack-save-untracked-cache-extension' 2017-05-30 11:16:45 +09:00
templates
vcs-svn timestamp_t: a new data type for timestamps 2017-04-27 13:07:39 +09:00
xdiff
.gitattributes Fix build with core.autocrlf=true 2017-05-10 13:32:50 +09:00
.gitignore
.mailmap Git 2.12.2 2017-03-24 13:31:01 -07:00
.travis.yml Merge branch 'ab/fix-poison-tests' 2017-05-23 13:46:09 +09:00
abspath.c prefix_filename: simplify windows #ifdef 2017-03-21 11:18:41 -07:00
aclocal.m4
advice.c
advice.h
alias.c
alloc.c
apply.c Merge branch 'jc/apply-fix-mismerge' 2017-05-16 11:51:59 +09:00
apply.h
archive-tar.c archive-tar: fix a sparse 'constant too large' warning 2017-05-09 11:23:14 +09:00
archive-zip.c Merge branch 'js/larger-timestamps' 2017-05-16 11:51:59 +09:00
archive.c tree: convert parse_tree_indirect to struct object_id 2017-05-08 15:12:58 +09:00
archive.h timestamp_t: a new data type for timestamps 2017-04-27 13:07:39 +09:00
argv-array.c
argv-array.h
attr.c
attr.h
base85.c
bisect.c Merge branch 'jk/update-links-in-docs' 2017-05-29 12:34:48 +09:00
bisect.h
blob.c Convert lookup_blob to struct object_id 2017-05-08 15:12:57 +09:00
blob.h Convert lookup_blob to struct object_id 2017-05-08 15:12:57 +09:00
branch.c Merge branch 'bc/object-id' 2017-05-29 12:34:43 +09:00
branch.h
builtin.h
bulk-checkin.c pack: convert struct pack_idx_entry to struct object_id 2017-05-08 15:12:57 +09:00
bulk-checkin.h
bundle.c Merge branch 'bc/object-id' 2017-05-29 12:34:43 +09:00
bundle.h bundle: convert to struct object_id 2017-05-02 10:46:41 +09:00
cache-tree.c Merge branch 'bc/object-id' 2017-05-29 12:34:43 +09:00
cache-tree.h Convert struct cache_tree to use struct object_id 2017-05-02 10:46:41 +09:00
cache.h grep: convert to struct object_id 2017-06-02 09:36:06 +09:00
check-builtins.sh
check-racy.c
check_bindir
color.c
color.h
column.c
column.h
combine-diff.c tree-diff: convert diff_tree_paths to struct object_id 2017-06-05 11:23:58 +09:00
command-list.txt
commit-slab.h
commit.c Merge branch 'bm/interpret-trailers-cut-line-is-eom' 2017-05-29 12:34:53 +09:00
commit.h Merge branch 'bc/object-id' 2017-05-29 12:34:43 +09:00
common-main.c
config.c Merge branch 'ab/conditional-config-with-symlinks' 2017-05-30 11:16:44 +09:00
config.mak.in
config.mak.uname config.mak.uname: set NO_REGEX=NeedsStartEnd on AIX 2017-05-04 16:10:51 +09:00
configure.ac
connect.c Merge branch 'sf/putty-w-args' 2017-04-26 15:39:10 +09:00
connect.h
connected.c
connected.h
convert.c convert: update subprocess_read_status() to not die on EOF 2017-05-15 13:01:57 +09:00
convert.h
copy.c
COPYING
credential-cache--daemon.c timestamp_t: a new data type for timestamps 2017-04-27 13:07:39 +09:00
credential-cache.c Merge branch 'nd/conditional-config-include' 2017-04-23 22:07:46 -07:00
credential-store.c path.c: and an option to call real_path() in expand_user_path() 2017-04-14 23:51:38 -07:00
credential.c
credential.h
csum-file.c
csum-file.h
ctype.c
daemon.c Merge branch 'dt/xgethostname-nul-termination' 2017-04-23 22:07:57 -07:00
date.c date.c: abort if the system time cannot handle one of our timestamps 2017-04-27 13:07:40 +09:00
decorate.c
decorate.h
delta.h
diff-delta.c
diff-lib.c diff: convert fill_filespec to struct object_id 2017-06-02 09:36:07 +09:00
diff-no-index.c diff: convert fill_filespec to struct object_id 2017-06-02 09:36:07 +09:00
diff.c diff: rename diff_fill_sha1_info to diff_fill_oid_info 2017-06-05 11:23:58 +09:00
diff.h tree-diff: convert diff_tree_paths to struct object_id 2017-06-05 11:23:58 +09:00
diffcore-break.c
diffcore-delta.c
diffcore-order.c
diffcore-pickaxe.c Merge branch 'js/regexec-buf' into maint 2017-03-28 13:52:24 -07:00
diffcore-rename.c diffcore-rename: use is_empty_blob_oid 2017-06-05 11:23:58 +09:00
diffcore.h diff: convert fill_filespec to struct object_id 2017-06-02 09:36:07 +09:00
dir-iterator.c
dir-iterator.h
dir.c dir: convert fill_directory to take an index 2017-05-06 19:15:39 +09:00
dir.h dir: convert fill_directory to take an index 2017-05-06 19:15:39 +09:00
editor.c
entry.c entry.c: submodule recursing: respect force flag correctly 2017-04-18 21:18:29 -07:00
environment.c Merge branch 'jk/bug-to-abort' 2017-05-29 12:34:45 +09:00
exec_cmd.c
exec_cmd.h
fast-import.c pack: convert struct pack_idx_entry to struct object_id 2017-05-08 15:12:57 +09:00
fetch-pack.c Merge branch 'jt/fetch-allow-tip-sha1-implicitly' 2017-05-30 11:16:43 +09:00
fetch-pack.h Rename sha1_array to oid_array 2017-03-31 08:33:56 -07:00
fmt-merge-msg.h
fsck.c Merge branch 'bc/object-id' 2017-05-29 12:34:43 +09:00
fsck.h Rename sha1_array to oid_array 2017-03-31 08:33:56 -07:00
generate-cmdlist.sh
gettext.c
gettext.h
git-add--interactive.perl Merge branch 'va/i18n-perl-scripts' 2017-04-19 21:37:17 -07:00
git-archimport.perl
git-bisect.sh
git-compat-util.h Merge branch 'bw/forking-and-threading' 2017-05-30 11:16:41 +09:00
git-cvsexportcommit.perl
git-cvsimport.perl
git-cvsserver.perl
git-difftool--helper.sh
git-filter-branch.sh git-filter-branch: be more direct in an error message 2017-05-12 15:27:10 +09:00
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-p4: don't use name-rev to get current branch 2017-04-16 21:13:26 -07:00
git-parse-remote.sh
git-quiltimport.sh
git-rebase--am.sh
git-rebase--interactive.sh doc: replace more gmane links 2017-05-09 21:13:13 -07:00
git-rebase--merge.sh
git-rebase.sh Merge branch 'gb/rebase-signoff' 2017-04-26 15:39:02 +09:00
git-remote-testgit.sh
git-request-pull.sh
git-send-email.perl Merge branch 'dk/send-email-avoid-net-smtp-ssl-when-able' 2017-05-30 11:16:45 +09:00
git-sh-i18n.sh
git-sh-setup.sh
git-stash.sh stash: keep untracked files intact in stash -k 2017-03-22 14:55:56 -07:00
git-submodule.sh submodule: prevent backslash expantion in submodule names 2017-04-16 20:09:36 -07:00
git-svn.perl
GIT-VERSION-GEN Start post 2.13 cycle 2017-05-16 11:52:15 +09:00
git-web--browse.sh
git.c Merge branch 'bw/recurse-submodules-relative-fix' 2017-03-30 14:07:15 -07:00
git.rc
gpg-interface.c
gpg-interface.h
graph.c
graph.h
grep.c diff: convert fill_filespec to struct object_id 2017-06-02 09:36:07 +09:00
grep.h grep: convert to struct object_id 2017-06-02 09:36:06 +09:00
hash.h
hashmap.c hashmap: add disallow_rehash setting 2017-03-22 13:41:41 -07:00
hashmap.h hashmap: add disallow_rehash setting 2017-03-22 13:41:41 -07:00
help.c Merge branch 'bw/forking-and-threading' 2017-05-30 11:16:41 +09:00
help.h
hex.c Convert GIT_SHA1_HEXSZ used for allocation to GIT_MAX_HEXSZ 2017-03-26 22:08:21 -07:00
http-backend.c Merge branch 'bc/object-id' 2017-05-29 12:34:43 +09:00
http-fetch.c
http-push.c object: convert parse_object* to take struct object_id 2017-05-08 15:12:58 +09:00
http-walker.c Merge branch 'ew/http-alternates-as-redirects-warning' into maint 2017-03-28 13:52:23 -07:00
http.c Merge branch 'dt/http-postbuffer-can-be-large' 2017-04-23 22:07:45 -07:00
http.h http.postbuffer: allow full range of ssize_t values 2017-04-13 18:24:32 -07:00
ident.c Merge branch 'dt/xgethostname-nul-termination' 2017-04-23 22:07:57 -07:00
imap-send.c convert unchecked snprintf into xsnprintf 2017-03-30 14:59:50 -07:00
INSTALL
iterator.h
khash.h
kwset.c
kwset.h
levenshtein.c
levenshtein.h
LGPL-2.1
line-log.c diff-tree: convert diff_tree_sha1 to struct object_id 2017-06-05 11:23:58 +09:00
line-log.h
line-range.c
line-range.h
list-objects.c Convert lookup_tree to struct object_id 2017-05-08 15:12:57 +09:00
list-objects.h
list.h
ll-merge.c
ll-merge.h
lockfile.c
lockfile.h
log-tree.c diff-tree: convert diff_tree_sha1 to struct object_id 2017-06-05 11:23:58 +09:00
log-tree.h
mailinfo.c mailinfo & mailsplit: check for EOF while parsing 2017-05-08 12:18:19 +09:00
mailinfo.h
mailmap.c
mailmap.h
Makefile Merge branch 'bp/sub-process-convert-filter' 2017-05-30 11:16:42 +09:00
match-trees.c
merge-blobs.c
merge-blobs.h
merge-recursive.c diff-tree: convert diff_tree_sha1 to struct object_id 2017-06-05 11:23:58 +09:00
merge-recursive.h
merge.c tree: convert parse_tree_indirect to struct object_id 2017-05-08 15:12:58 +09:00
mergesort.c
mergesort.h
mru.c
mru.h
name-hash.c name-hash: fix buffer overrun 2017-03-31 20:57:18 -07:00
notes-cache.c notes: convert some accessor functions to struct object_id 2017-06-02 09:36:06 +09:00
notes-cache.h notes-cache: convert to struct object_id 2017-05-08 15:12:57 +09:00
notes-merge.c diff-tree: convert diff_tree_sha1 to struct object_id 2017-06-05 11:23:58 +09:00
notes-merge.h notes-merge: convert notes_merge* to struct object_id 2017-06-05 11:23:58 +09:00
notes-utils.c notes: convert some accessor functions to struct object_id 2017-06-02 09:36:06 +09:00
notes-utils.h builtin/notes: convert to struct object_id 2017-06-02 09:36:06 +09:00
notes.c notes: convert some accessor functions to struct object_id 2017-06-02 09:36:06 +09:00
notes.h notes: convert some accessor functions to struct object_id 2017-06-02 09:36:06 +09:00
object.c object: convert parse_object* to take struct object_id 2017-05-08 15:12:58 +09:00
object.h object: convert parse_object* to take struct object_id 2017-05-08 15:12:58 +09:00
oidset.c
oidset.h
pack-bitmap-write.c pack: convert struct pack_idx_entry to struct object_id 2017-05-08 15:12:57 +09:00
pack-bitmap.c object: convert parse_object* to take struct object_id 2017-05-08 15:12:58 +09:00
pack-bitmap.h
pack-check.c Convert the verify_pack callback to struct object_id 2017-05-08 15:12:57 +09:00
pack-objects.c pack: convert struct pack_idx_entry to struct object_id 2017-05-08 15:12:57 +09:00
pack-objects.h
pack-revindex.c
pack-revindex.h
pack-write.c pack: convert struct pack_idx_entry to struct object_id 2017-05-08 15:12:57 +09:00
pack.h Convert the verify_pack callback to struct object_id 2017-05-08 15:12:57 +09:00
pager.c Merge branch 'jk/pager-in-use' 2017-03-28 14:05:59 -07:00
parse-options-cb.c Merge branch 'bc/object-id' 2017-05-29 12:34:43 +09:00
parse-options.c prefix_filename: return newly allocated string 2017-03-21 11:18:41 -07:00
parse-options.h ref-filter: add --no-contains option to tag/branch/for-each-ref 2017-03-24 12:15:26 -07:00
patch-delta.c
patch-ids.c diff-tree: convert diff_tree_sha1 to struct object_id 2017-06-05 11:23:58 +09:00
patch-ids.h patch-ids: convert to struct object_id 2017-06-02 09:36:07 +09:00
path.c Merge branch 'nd/conditional-config-include' 2017-04-23 22:07:46 -07:00
pathspec.c pathspec: convert find_pathspecs_matching_against_index to take an index 2017-05-12 14:23:46 +09:00
pathspec.h pathspec: convert find_pathspecs_matching_against_index to take an index 2017-05-12 14:23:46 +09:00
pkt-line.c convert: move packet_write_line() into pkt-line as packet_writel() 2017-05-08 10:57:26 +09:00
pkt-line.h pkt-line: annotate packet_writel with LAST_ARG_MUST_BE_NULL 2017-05-15 13:01:36 +09:00
preload-index.c
pretty.c Merge branch 'bc/object-id' 2017-05-29 12:34:43 +09:00
prio-queue.c Merge branch 'jk/prio-queue-avoid-swap-with-self' 2017-05-01 14:14:43 +09:00
prio-queue.h
progress.c
progress.h
prompt.c
prompt.h
quote.c
quote.h
reachable.c Merge branch 'bc/object-id' 2017-05-29 12:34:43 +09:00
reachable.h timestamp_t: a new data type for timestamps 2017-04-27 13:07:39 +09:00
read-cache.c Merge branch 'dt/unpack-save-untracked-cache-extension' 2017-05-30 11:16:45 +09:00
README.md
ref-filter.c Merge branch 'kn/ref-filter-branch-list' 2017-05-29 12:34:51 +09:00
ref-filter.h Convert struct ref_array_item to struct object_id 2017-05-08 15:12:57 +09:00
reflog-walk.c Merge branch 'js/plug-leaks' 2017-05-29 12:34:44 +09:00
reflog-walk.h
refs.c Merge branch 'bc/object-id' 2017-05-29 12:34:43 +09:00
refs.h Merge branch 'bc/object-id' 2017-05-29 12:34:43 +09:00
RelNotes Start post 2.13 cycle 2017-05-16 11:52:15 +09:00
remote-curl.c Merge branch 'dt/http-postbuffer-can-be-large' 2017-04-23 22:07:45 -07:00
remote-testsvn.c notes: convert some accessor functions to struct object_id 2017-06-02 09:36:06 +09:00
remote.c Merge branch 'js/plug-leaks' 2017-05-29 12:34:44 +09:00
remote.h Merge branch 'bw/push-options-recursively-to-submodules' 2017-04-19 21:37:14 -07:00
replace_object.c
rerere.c
rerere.h
resolve-undo.c
resolve-undo.h
revision.c diff-tree: convert diff_tree_sha1 to struct object_id 2017-06-05 11:23:58 +09:00
revision.h Merge branch 'bc/object-id' 2017-05-29 12:34:43 +09:00
run-command.c run-command: restrict PATH search to executable files 2017-04-25 23:17:36 -07:00
run-command.h run-command: expose is_executable function 2017-04-25 18:45:29 -07:00
send-pack.c Merge branch 'bc/object-id' 2017-04-19 21:37:13 -07:00
send-pack.h Rename sha1_array to oid_array 2017-03-31 08:33:56 -07:00
sequencer.c diff-tree: convert diff_tree_sha1 to struct object_id 2017-06-05 11:23:58 +09:00
sequencer.h
server-info.c object: convert parse_object* to take struct object_id 2017-05-08 15:12:58 +09:00
setup.c setup_discovered_git_dir(): plug memory leak 2017-05-08 12:18:19 +09:00
sh-i18n--envsubst.c
sha1-array.c Rename sha1_array to oid_array 2017-03-31 08:33:56 -07:00
sha1-array.h Rename sha1_array to oid_array 2017-03-31 08:33:56 -07:00
sha1-lookup.c
sha1-lookup.h
sha1_file.c Merge branch 'jk/loose-object-fsck' 2017-04-23 22:07:50 -07:00
sha1_name.c Merge branch 'bc/object-id' 2017-05-29 12:34:43 +09:00
shallow.c Merge branch 'js/plug-leaks' 2017-05-29 12:34:44 +09:00
shell.c Merge branch 'maint-2.8' into maint-2.9 2017-05-05 13:13:48 +09:00
shortlog.h
show-index.c
sideband.c
sideband.h
sigchain.c
sigchain.h
split-index.c split-index: add and use unshare_split_index() 2017-05-08 10:50:20 +09:00
split-index.h split-index: add and use unshare_split_index() 2017-05-08 10:50:20 +09:00
strbuf.c Merge branch 'rs/freebsd-getcwd-workaround' 2017-03-30 14:07:15 -07:00
strbuf.h Merge branch 'jk/interpret-branch-name' into maint 2017-03-28 13:52:22 -07:00
streaming.c
streaming.h
string-list.c Merge branch 'bw/forking-and-threading' 2017-05-30 11:16:41 +09:00
string-list.h string-list: add string_list_remove function 2017-04-20 17:55:32 -07:00
sub-process.c convert: update subprocess_read_status() to not die on EOF 2017-05-15 13:01:57 +09:00
sub-process.h convert: update subprocess_read_status() to not die on EOF 2017-05-15 13:01:57 +09:00
submodule-config.c Merge branch 'sb/checkout-recurse-submodules' 2017-03-28 14:05:58 -07:00
submodule-config.h
submodule.c Merge branch 'bw/pathspec-sans-the-index' 2017-05-30 11:16:40 +09:00
submodule.h Merge branch 'bw/pathspec-sans-the-index' 2017-05-30 11:16:40 +09:00
symlinks.c
tag.c Merge branch 'bc/object-id' 2017-05-29 12:34:43 +09:00
tag.h Merge branch 'bc/object-id' 2017-05-29 12:34:43 +09:00
tar.h
tempfile.c
tempfile.h
thread-utils.c
thread-utils.h
tmp-objdir.c
tmp-objdir.h
trace.c
trace.h
trailer.c
trailer.h
transport-helper.c transport-helper: replace checked snprintf with xsnprintf 2017-03-30 14:59:50 -07:00
transport.c bundle: convert to struct object_id 2017-05-02 10:46:41 +09:00
transport.h
tree-diff.c tree-diff: don't access hash of NULL object_id pointer 2017-07-17 14:49:36 -07:00
tree-walk.c doc: replace more gmane links 2017-05-09 21:13:13 -07:00
tree-walk.h
tree.c object: convert parse_object* to take struct object_id 2017-05-08 15:12:58 +09:00
tree.h tree: convert parse_tree_indirect to struct object_id 2017-05-08 15:12:58 +09:00
unicode_width.h
unimplemented.sh
unix-socket.c
unix-socket.h
unpack-trees.c Merge branch 'dt/unpack-save-untracked-cache-extension' 2017-05-30 11:16:45 +09:00
unpack-trees.h
upload-pack.c Merge branch 'bc/object-id' 2017-05-29 12:34:43 +09:00
url.c
url.h
urlmatch.c
urlmatch.h
usage.c Merge branch 'bw/forking-and-threading' 2017-05-30 11:16:41 +09:00
userdiff.c
userdiff.h
utf8.c
utf8.h
varint.c
varint.h
version.c
version.h
versioncmp.c
walker.c object: convert parse_object* to take struct object_id 2017-05-08 15:12:58 +09:00
walker.h
wildmatch.c
wildmatch.h
worktree.c Merge branch 'js/plug-leaks' 2017-05-29 12:34:44 +09:00
worktree.h worktree.c: kill parse_ref() in favor of refs_resolve_ref_unsafe() 2017-04-24 21:28:55 -07:00
wrap-for-bin.sh
wrapper.c Merge branch 'dt/xgethostname-nul-termination' 2017-04-23 22:07:57 -07:00
write_or_die.c
ws.c
wt-status.c Merge branch 'bm/interpret-trailers-cut-line-is-eom' 2017-05-29 12:34:53 +09:00
wt-status.h interpret-trailers: honor the cut line 2017-05-18 15:00:48 +09:00
xdiff-interface.c
xdiff-interface.h
zlib.c

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-.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://public-inbox.org/git/, http://marc.info/?l=git and other archival sites.

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