Go to file
Johannes Schindelin a8dee3ca61 Disallow dubiously-nested submodule git directories
Currently it is technically possible to let a submodule's git
directory point right into the git dir of a sibling submodule.

Example: the git directories of two submodules with the names `hippo`
and `hippo/hooks` would be `.git/modules/hippo/` and
`.git/modules/hippo/hooks/`, respectively, but the latter is already
intended to house the former's hooks.

In most cases, this is just confusing, but there is also a (quite
contrived) attack vector where Git can be fooled into mistaking remote
content for file contents it wrote itself during a recursive clone.

Let's plug this bug.

To do so, we introduce the new function `validate_submodule_git_dir()`
which simply verifies that no git dir exists for any leading directories
of the submodule name (if there are any).

Note: this patch specifically continues to allow sibling modules names
of the form `core/lib`, `core/doc`, etc, as long as `core` is not a
submodule name.

This fixes CVE-2019-1387.

Reported-by: Nicolas Joly <Nicolas.Joly@microsoft.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2019-12-05 15:36:51 +01:00
.github
Documentation fast-import: disallow "feature import-marks" by default 2019-12-04 13:20:04 +01:00
block-sha1
builtin Disallow dubiously-nested submodule git directories 2019-12-05 15:36:51 +01:00
ci travis-ci: fix "skip_branch_tip_with_tag()" string comparison 2017-09-22 10:58:29 +09:00
compat Merge branch 'rb/compat-poll-fix' into maint 2017-10-18 14:19:05 +09:00
contrib Merge branch 'tb/complete-describe' into maint 2017-10-18 14:19:14 +09:00
ewah
git-gui
gitk-git
gitweb Merge branch 'hb/gitweb-project-list' into maint 2017-08-23 14:33:44 -07:00
mergetools
perl Merge branch 'jc/perl-git-comment-typofix' into maint 2017-09-10 17:02:57 +09:00
po
ppc
refs convert less-trivial versions of "write_in_full() != len" 2017-09-14 15:17:59 +09:00
sha1collisiondetection@19d97bf5af
sha1dc
t Disallow dubiously-nested submodule git directories 2019-12-05 15:36:51 +01:00
templates
vcs-svn Merge branch 'jn/vcs-svn-cleanup' into maint 2017-09-10 17:03:09 +09:00
xdiff
.gitattributes
.gitignore
.gitmodules
.mailmap .mailmap: normalize name for René Scharfe 2017-10-06 11:31:41 +09:00
.travis.yml travis-ci: move Travis CI code into dedicated scripts 2017-09-11 09:54:08 +09:00
.tsan-suppressions ThreadSanitizer: add suppressions 2017-08-23 10:38:56 -07:00
COPYING
GIT-VERSION-GEN Git 2.14.5 2018-09-27 11:19:11 -07:00
INSTALL
LGPL-2.1
Makefile Merge branch 'jn/vcs-svn-cleanup' into maint 2017-09-10 17:03:09 +09:00
README.md
RelNotes Git 2.14.5 2018-09-27 11:19:11 -07:00
abspath.c
aclocal.m4
advice.c
advice.h
alias.c
alloc.c
apply.c Sync with Git 2.13.7 2018-05-22 14:10:49 +09:00
apply.h apply: remove prefix_length member from apply_state 2017-08-09 10:21:45 -07:00
archive-tar.c
archive-zip.c
archive.c archive: don't add empty directories to archives 2017-09-14 15:08:22 +09:00
archive.h
argv-array.c
argv-array.h
attr.c
attr.h
base85.c
bisect.c
bisect.h
blame.c
blame.h
blob.c
blob.h
branch.c Merge branch 'nd/worktree-kill-parse-ref' into maint 2017-10-23 14:14:16 +09:00
branch.h
builtin.h
bulk-checkin.c
bulk-checkin.h
bundle.c
bundle.h
cache-tree.c
cache-tree.h
cache.h Sync with Git 2.13.7 2018-05-22 14:10:49 +09:00
check-builtins.sh
check-racy.c
check_bindir
color.c Revert "color: check color.ui in git_default_config()" 2017-10-17 15:09:52 +09:00
color.h
column.c
column.h
combine-diff.c
command-list.txt
commit-slab.h commit-slab.h: avoid -Wsign-compare warnings 2017-09-22 13:00:36 +09:00
commit.c
commit.h commit: remove unused inline function single_parent() 2017-08-19 09:24:05 -07:00
common-main.c
config.c Merge branch 'jk/write-in-full-fix' into maint 2017-10-23 14:37:22 +09:00
config.h
config.mak.in
config.mak.uname protect_ntfs: turn on NTFS protection by default 2019-12-05 15:36:51 +01:00
configure.ac
connect.c Git 2.13.5 2017-08-04 12:40:37 -07:00
connect.h
connected.c
connected.h
convert.c Merge branch 'ma/ts-cleanups' into maint 2017-10-23 14:19:02 +09:00
convert.h Merge branch 'tb/apply-with-crlf' into maint 2017-09-10 17:02:55 +09:00
copy.c
credential-cache--daemon.c
credential-cache.c Merge branch 'dl/credential-cache-socket-in-xdg-cache' into maint 2017-08-23 14:33:45 -07:00
credential-store.c
credential.c
credential.h
csum-file.c
csum-file.h
ctype.c
daemon.c
date.c
decorate.c
decorate.h
delta.h
diff-delta.c
diff-lib.c
diff-no-index.c
diff.c Merge branch 'jk/write-in-full-fix' into maint 2017-10-23 14:37:22 +09: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.h
dir.c Merge branch 'rs/stat-data-unaligned-reads-fix' into maint 2017-08-23 14:33:48 -07:00
dir.h
editor.c
entry.c convert less-trivial versions of "write_in_full() != len" 2017-09-14 15:17:59 +09:00
environment.c protect_ntfs: turn on NTFS protection by default 2019-12-05 15:36:51 +01:00
exec_cmd.c git_extract_argv0_path: do nothing without RUNTIME_PREFIX 2017-09-07 09:41:14 +09:00
exec_cmd.h
fast-import.c fast-import: disallow "feature import-marks" by default 2019-12-04 13:20:04 +01:00
fetch-pack.c
fetch-pack.h
fmt-merge-msg.h
fsck.c is_ntfs_dotgit(): only verify the leading segment 2019-12-05 15:36:50 +01:00
fsck.h
generate-cmdlist.sh
gettext.c
gettext.h
git-add--interactive.perl
git-archimport.perl archimport: use safe_pipe_capture for user input 2017-09-12 11:08:15 +09:00
git-bisect.sh
git-compat-util.h Sync with Git 2.13.7 2018-05-22 14:10:49 +09:00
git-cvsexportcommit.perl
git-cvsimport.perl cvsimport: shell-quote variable used in backticks 2017-09-12 11:10:22 +09:00
git-cvsserver.perl cvsserver: use safe_pipe_capture for `constant commands` as well 2017-09-11 14:52:29 +09:00
git-difftool--helper.sh
git-filter-branch.sh
git-instaweb.sh
git-merge-octopus.sh scripts: use "git foo" not "git-foo" 2017-08-07 12:04:45 -07:00
git-merge-one-file.sh scripts: use "git foo" not "git-foo" 2017-08-07 12:04:45 -07:00
git-merge-resolve.sh scripts: use "git foo" not "git-foo" 2017-08-07 12:04:45 -07:00
git-mergetool--lib.sh
git-mergetool.sh
git-p4.py
git-parse-remote.sh
git-quiltimport.sh
git-rebase--am.sh
git-rebase--interactive.sh
git-rebase--merge.sh
git-rebase.sh
git-remote-testgit.sh
git-request-pull.sh request-pull: capitalise "Git" to make it a proper noun 2017-10-03 13:11:57 +09:00
git-send-email.perl send-email: don't use Mail::Address, even if available 2017-08-24 14:40:17 -07:00
git-sh-i18n.sh
git-sh-setup.sh
git-stash.sh Merge branch 'mf/no-dashed-subcommands' into maint 2017-09-10 17:02:56 +09:00
git-submodule.sh clone --recurse-submodules: prevent name squatting on Windows 2019-12-04 13:20:05 +01:00
git-svn.perl
git-web--browse.sh
git.c
git.rc
gpg-interface.c
gpg-interface.h
graph.c
graph.h
grep.c Merge branch 'as/grep-quiet-no-match-exit-code-fix' into maint 2017-09-10 17:02:55 +09:00
grep.h
hash.h
hashmap.c
hashmap.h
help.c
help.h
hex.c
http-backend.c avoid "write_in_full(fd, buf, len) != len" pattern 2017-09-14 15:17:59 +09:00
http-fetch.c
http-push.c http-push: fix construction of hex value from path 2017-10-04 13:48:35 +09:00
http-walker.c
http.c Merge branch 'jc/http-sslkey-and-ssl-cert-are-paths' into maint 2017-08-23 14:33:43 -07:00
http.h
ident.c
imap-send.c
iterator.h
khash.h
kwset.c
kwset.h
levenshtein.c
levenshtein.h
line-log.c ALLOC_GROW: avoid -Wsign-compare warnings 2017-09-22 13:21:11 +09:00
line-log.h ALLOC_GROW: avoid -Wsign-compare warnings 2017-09-22 13:21:11 +09:00
line-range.c
line-range.h
list-objects.c
list-objects.h
list.h
ll-merge.c avoid "write_in_full(fd, buf, len) != len" pattern 2017-09-14 15:17:59 +09:00
ll-merge.h
lockfile.c
lockfile.h
log-tree.c
log-tree.h
mailinfo.c Merge branch 'rs/mailinfo-qp-decode-fix' into maint 2017-10-18 14:19:03 +09:00
mailinfo.h
mailmap.c
mailmap.h
match-trees.c
merge-blobs.c
merge-blobs.h
merge-recursive.c
merge-recursive.h
merge.c
mergesort.c
mergesort.h
mru.c
mru.h
name-hash.c
notes-cache.c
notes-cache.h
notes-merge.c notes-merge: use ssize_t for write_in_full() return value 2017-09-14 15:17:59 +09:00
notes-merge.h
notes-utils.c
notes-utils.h
notes.c
notes.h
object.c
object.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
pager.c
parse-options-cb.c
parse-options.c
parse-options.h
patch-delta.c
patch-ids.c
patch-ids.h
path.c is_ntfs_dotgit(): speed it up 2019-12-05 15:36:51 +01:00
path.h
pathspec.c
pathspec.h
pkt-line.c Merge branch 'jk/write-in-full-fix' into maint 2017-10-23 14:37:22 +09:00
pkt-line.h
preload-index.c
pretty.c
prio-queue.c
prio-queue.h
progress.c
progress.h
prompt.c
prompt.h
quote.c
quote.h
reachable.c
reachable.h
read-cache.c is_ntfs_dotgit(): only verify the leading segment 2019-12-05 15:36:50 +01:00
ref-filter.c ref-filter.c: pass empty-string as NULL to atom parsers 2017-10-05 10:41:57 +09:00
ref-filter.h
reflog-walk.c
reflog-walk.h
refs.c Merge branch 'jk/write-in-full-fix' into maint 2017-10-23 14:37:22 +09:00
refs.h refs: strip out not allowed flags from ref_transaction_update 2017-09-14 14:46:05 +09:00
remote-curl.c
remote-testsvn.c
remote.c
remote.h
replace_object.c
repository.c
repository.h
rerere.c avoid "write_in_full(fd, buf, len) != len" pattern 2017-09-14 15:17:59 +09:00
rerere.h
resolve-undo.c
resolve-undo.h
revision.c ALLOC_GROW: avoid -Wsign-compare warnings 2017-09-22 13:21:11 +09:00
revision.h
run-command.c run-command: use ALLOC_ARRAY 2017-10-03 08:42:57 +09:00
run-command.h
send-pack.c
send-pack.h
sequencer.c
sequencer.h
server-info.c
setup.c
sh-i18n--envsubst.c
sha1-array.c
sha1-array.h
sha1-lookup.c sha1_file: drop experimental GIT_USE_LOOKUP search 2017-08-09 11:03:35 -07:00
sha1-lookup.h sha1-lookup: remove sha1_entry_pos() from header file 2017-08-25 09:54:26 -07:00
sha1_file.c Merge branch 'jk/info-alternates-fix' into maint 2017-10-23 14:40:00 +09:00
sha1_name.c
sha1dc_git.c
sha1dc_git.h
shallow.c avoid "write_in_full(fd, buf, len) != len" pattern 2017-09-14 15:17:59 +09:00
shell.c shell: drop git-cvsserver support by default 2017-09-12 11:05:58 +09:00
shortlog.h
show-index.c
sideband.c
sideband.h
sigchain.c
sigchain.h
split-index.c
split-index.h
strbuf.c Merge branch 'rs/strbuf-getwholeline-fix' into maint 2017-10-18 14:18:58 +09:00
strbuf.h Merge branch 'ma/ts-cleanups' into maint 2017-10-23 14:19:02 +09:00
streaming.c convert less-trivial versions of "write_in_full() != len" 2017-09-14 15:17:59 +09:00
streaming.h
string-list.c
string-list.h for_each_string_list_item: avoid undefined behavior for empty list 2017-09-20 14:41:08 +09:00
sub-process.c Merge branch 'cc/subprocess-handshake-missing-capabilities' into maint 2017-10-18 14:19:10 +09:00
sub-process.h
submodule-config.c submodule-config: ban submodule paths that start with a dash 2018-09-27 09:34:59 -07:00
submodule-config.h Sync with Git 2.13.7 2018-05-22 14:10:49 +09:00
submodule.c Disallow dubiously-nested submodule git directories 2019-12-05 15:36:51 +01:00
submodule.h Disallow dubiously-nested submodule git directories 2019-12-05 15:36:51 +01:00
symlinks.c
tag.c tag: avoid NULL pointer arithmetic 2017-10-02 13:14:33 +09:00
tag.h
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 fast-import: disallow "feature export-marks" by default 2019-12-04 13:20:04 +01:00
transport.c
transport.h
tree-diff.c
tree-walk.c mingw: disallow backslash characters in tree objects' file names 2019-12-04 13:20:05 +01:00
tree-walk.h
tree.c
tree.h
unicode_width.h
unimplemented.sh
unix-socket.c
unix-socket.h
unpack-trees.c
unpack-trees.h
upload-pack.c
url.c
url.h
urlmatch.c
urlmatch.h
usage.c
userdiff.c Merge branch 'ik/userdiff-html-h-element-fix' into maint 2017-10-18 14:19:02 +09:00
userdiff.h
utf8.c is_hfs_dotgit: match other .git files 2018-05-21 23:50:11 -04:00
utf8.h is_hfs_dotgit: match other .git files 2018-05-21 23:50:11 -04:00
varint.c
varint.h
version.c
version.h
versioncmp.c
walker.c
walker.h
wildmatch.c
wildmatch.h
worktree.c Merge branch 'nd/worktree-kill-parse-ref' into maint 2017-10-23 14:14:16 +09:00
worktree.h
wrap-for-bin.sh
wrapper.c avoid "write_in_full(fd, buf, len) != len" pattern 2017-09-14 15:17:59 +09:00
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-.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