Go to file
Brandon Williams eef3df5a93 pathspec: only match across submodule boundaries when requested
Commit 74ed43711f (grep: enable recurse-submodules to work on <tree>
objects, 2016-12-16) taught 'tree_entry_interesting()' to be able to
match across submodule boundaries in the presence of wildcards.  This is
done by performing literal matching up to the first wildcard and then
punting to the submodule itself to perform more accurate pattern
matching.  Instead of introducing a new flag to request this behavior,
commit 74ed43711f overloaded the already existing 'recursive' flag in
'struct pathspec' to request this behavior.

This leads to a bug where whenever any other caller has the 'recursive'
flag set as well as a pathspec with wildcards that all submodules will
be indicated as matches.  One simple example of this is:

	git init repo
	cd repo

	git init submodule
	git -C submodule commit -m initial --allow-empty

	touch "[bracket]"
	git add "[bracket]"
	git commit -m bracket
	git add submodule
	git commit -m submodule

	git rev-list HEAD -- "[bracket]"

Fix this by introducing the new flag 'recurse_submodules' in 'struct
pathspec' and using this flag to determine if matches should be allowed
to cross submodule boundaries.

This fixes https://github.com/git-for-windows/git/issues/1371.

Signed-off-by: Brandon Williams <bmwill@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-12-05 09:23:15 -08:00
.github
Documentation grep: recurse in-process using 'struct repository' 2017-08-02 14:26:46 -07:00
block-sha1
builtin pathspec: only match across submodule boundaries when requested 2017-12-05 09:23:15 -08:00
ci
compat Spelling fixes 2017-06-27 10:35:49 -07:00
contrib Merge branch 'aw/contrib-subtree-doc-asciidoctor' into maint 2017-07-10 13:59:06 -07:00
ewah use DIV_ROUND_UP 2017-07-10 14:24:36 -07:00
git-gui
gitk-git
gitweb Spelling fixes 2017-06-27 10:35:49 -07:00
mergetools
perl Merge branch 'pw/unquote-path-in-git-pm' 2017-07-10 13:42:50 -07:00
po l10n: de.po: fix typo 2017-07-10 11:44:18 -07:00
ppc
refs Merge branch 'mh/packed-ref-store-prep' 2017-06-26 14:09:29 -07:00
sha1collisiondetection@19d97bf5af sha1dc: optionally use sha1collisiondetection as a submodule 2017-07-03 10:09:34 -07:00
sha1dc Merge branch 'ab/sha1dc-maint' 2017-07-06 18:14:44 -07:00
t pathspec: only match across submodule boundaries when requested 2017-12-05 09:23:15 -08:00
templates
vcs-svn
xdiff
.gitattributes
.gitignore
.gitmodules sha1dc: optionally use sha1collisiondetection as a submodule 2017-07-03 10:09:34 -07:00
.mailmap
.travis.yml
COPYING
GIT-VERSION-GEN Git 2.14-rc0 2017-07-13 16:22:29 -07:00
INSTALL
LGPL-2.1
Makefile Merge branch 'jk/build-with-asan' 2017-07-13 16:14:54 -07:00
README.md
RelNotes Prepare for 2.13.3 2017-07-10 14:02:07 -07:00
abspath.c Spelling fixes 2017-06-27 10:35:49 -07:00
aclocal.m4
advice.c
advice.h
alias.c
alloc.c
apply.c Merge branch 'rs/apply-avoid-over-reading' 2017-07-12 15:18:22 -07:00
apply.h
archive-tar.c
archive-zip.c
archive.c
archive.h
argv-array.c
argv-array.h
attr.c hashmap.h: compare function has access to a data field 2017-06-30 12:49:28 -07:00
attr.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 grep: recurse in-process using 'struct repository' 2017-08-02 14:26:46 -07:00
check-builtins.sh
check-racy.c
check_bindir
color.c
color.h
column.c
column.h
combine-diff.c
command-list.txt
commit-slab.h
commit.c
commit.h
common-main.c
config.c config: add config_from_gitmodules 2017-08-02 14:26:46 -07:00
config.h config: add config_from_gitmodules 2017-08-02 14:26:46 -07:00
config.mak.in
config.mak.uname
configure.ac
connect.c
connect.h
connected.c
connected.h
convert.c hashmap.h: compare function has access to a data field 2017-06-30 12:49:28 -07:00
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 Merge branch 'ab/strbuf-addftime-tzname-boolify' 2017-07-06 18:14:47 -07:00
decorate.c
decorate.h
delta.h
diff-delta.c
diff-lib.c
diff-no-index.c
diff.c Merge branch 'rs/use-div-round-up' 2017-07-12 15:18:23 -07:00
diff.h
diffcore-break.c
diffcore-delta.c
diffcore-order.c
diffcore-pickaxe.c
diffcore-rename.c hashmap.h: compare function has access to a data field 2017-06-30 12:49:28 -07:00
diffcore.h
dir-iterator.c
dir-iterator.h
dir.c Merge branch 'ab/wildmatch' 2017-07-10 13:42:51 -07:00
dir.h
editor.c
entry.c
environment.c
exec_cmd.c
exec_cmd.h
fast-import.c
fetch-pack.c
fetch-pack.h
fmt-merge-msg.h
fsck.c
fsck.h
generate-cmdlist.sh
gettext.c
gettext.h
git-add--interactive.perl Merge branch 'jk/add-p-commentchar-fix' into maint 2017-07-10 13:58:59 -07:00
git-archimport.perl
git-bisect.sh
git-compat-util.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-parse-remote.sh
git-quiltimport.sh
git-rebase--am.sh
git-rebase--interactive.sh
git-rebase--merge.sh
git-rebase.sh Merge branch 'pw/rebase-i-regression-fix-tests' into maint 2017-07-10 13:59:00 -07:00
git-remote-testgit.sh
git-request-pull.sh
git-send-email.perl Merge branch 'xz/send-email-batch-size' 2017-07-06 18:14:46 -07:00
git-sh-i18n.sh
git-sh-setup.sh
git-stash.sh Merge branch 'lb/status-stash-count' 2017-06-26 14:09:29 -07:00
git-submodule.sh
git-svn.perl
git-web--browse.sh
git.c grep: recurse in-process using 'struct repository' 2017-08-02 14:26:46 -07:00
git.rc
gpg-interface.c
gpg-interface.h
graph.c
graph.h
grep.c grep: recurse in-process using 'struct repository' 2017-08-02 14:26:46 -07:00
grep.h grep: recurse in-process using 'struct repository' 2017-08-02 14:26:46 -07:00
hash.h sha1dc: optionally use sha1collisiondetection as a submodule 2017-07-03 10:09:34 -07:00
hashmap.c hashmap.h: compare function has access to a data field 2017-06-30 12:49:28 -07:00
hashmap.h hashmap: migrate documentation from Documentation/technical into header 2017-06-30 13:11:59 -07:00
help.c Merge branch 'mb/reword-autocomplete-message' into maint 2017-07-10 13:59:04 -07:00
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 Merge branch 'rs/use-div-round-up' 2017-07-12 15:18:23 -07:00
iterator.h
khash.h
kwset.c
kwset.h
levenshtein.c
levenshtein.h
line-log.c
line-log.h
line-range.c
line-range.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
mailinfo.c Spelling fixes 2017-06-27 10:35:49 -07:00
mailinfo.h
mailmap.c
mailmap.h
match-trees.c
merge-blobs.c
merge-blobs.h
merge-recursive.c Merge branch 'sb/merge-recursive-code-cleanup' 2017-07-06 18:14:45 -07:00
merge-recursive.h
merge.c
mergesort.c
mergesort.h
mru.c
mru.h
name-hash.c hashmap.h: compare function has access to a data field 2017-06-30 12:49:28 -07:00
notes-cache.c
notes-cache.h
notes-merge.c
notes-merge.h
notes-utils.c
notes-utils.h
notes.c
notes.h
object.c
object.h
oidset.c hashmap.h: compare function has access to a data field 2017-06-30 12:49:28 -07:00
oidset.h
pack-bitmap-write.c
pack-bitmap.c Merge branch 'jc/pack-bitmap-unaligned' into maint 2017-07-10 13:59:00 -07:00
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.c: use hashmap correctly 2017-06-30 13:11:54 -07:00
patch-ids.h
path.c
path.h
pathspec.c Spelling fixes 2017-06-27 10:35:49 -07:00
pathspec.h pathspec: only match across submodule boundaries when requested 2017-12-05 09:23:15 -08:00
pkt-line.c
pkt-line.h
preload-index.c
pretty.c Merge branch 'rs/pretty-add-again' into maint 2017-07-10 13:58:57 -07:00
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 Merge branch 'cc/shared-index-permfix' 2017-07-05 13:32:57 -07:00
ref-filter.c Merge branch 'kn/ref-filter-branch-list' into maint 2017-07-12 15:23:09 -07:00
ref-filter.h
reflog-walk.c Merge branch 'jk/reflog-walk-maint' 2017-07-10 13:42:53 -07:00
reflog-walk.h
refs.c Merge branch 'sb/hashmap-customize-comparison' 2017-07-13 16:14:54 -07:00
refs.h Spelling fixes 2017-06-27 10:35:49 -07:00
remote-curl.c
remote-testsvn.c
remote.c hashmap.h: compare function has access to a data field 2017-06-30 12:49:28 -07:00
remote.h
replace_object.c
repository.c repository: have the_repository use the_index 2017-07-18 13:32:25 -07:00
repository.h repo_read_index: don't discard the index 2017-07-18 13:32:25 -07:00
rerere.c
rerere.h
resolve-undo.c
resolve-undo.h
revision.c Merge branch 'ab/grep-lose-opt-regflags' 2017-07-13 16:14:54 -07:00
revision.h Merge branch 'sg/revision-parser-skip-prefix' into maint 2017-06-24 15:29:34 -07:00
run-command.c
run-command.h
send-pack.c Spelling fixes 2017-06-27 10:35:49 -07:00
send-pack.h
sequencer.c Merge branch 'pw/rebase-i-regression-fix-tests' into maint 2017-07-10 13:59:00 -07:00
sequencer.h
server-info.c
setup.c grep: recurse in-process using 'struct repository' 2017-08-02 14:26:46 -07:00
sh-i18n--envsubst.c
sha1-array.c
sha1-array.h
sha1-lookup.c
sha1-lookup.h
sha1_file.c Merge branch 'sb/hashmap-customize-comparison' 2017-07-13 16:14:54 -07:00
sha1_name.c Merge branch 'rs/use-div-round-up' 2017-07-12 15:18:23 -07:00
sha1dc_git.c
sha1dc_git.h
shallow.c Merge branch 'rs/use-div-round-up' 2017-07-12 15:18:23 -07:00
shell.c
shortlog.h
show-index.c
sideband.c
sideband.h
sigchain.c
sigchain.h
split-index.c
split-index.h
strbuf.c Merge branch 'rs/pretty-add-again' into maint 2017-07-10 13:58:57 -07:00
strbuf.h Merge branch 'rs/pretty-add-again' into maint 2017-07-10 13:58:57 -07:00
streaming.c
streaming.h
string-list.c
string-list.h
sub-process.c hashmap.h: compare function has access to a data field 2017-06-30 12:49:28 -07:00
sub-process.h hashmap.h: compare function has access to a data field 2017-06-30 12:49:28 -07:00
submodule-config.c submodule: remove submodule.fetchjobs from submodule-config parsing 2017-08-02 14:26:46 -07:00
submodule-config.h submodule: remove submodule.fetchjobs from submodule-config parsing 2017-08-02 14:26:46 -07:00
submodule.c submodule: merge repo_read_gitmodules and gitmodules_config 2017-08-02 14:26:46 -07:00
submodule.h submodule: check for unmerged .gitmodules outside of config parsing 2017-08-02 14:26:46 -07: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
trailer.c
trailer.h
transport-helper.c
transport.c
transport.h
tree-diff.c
tree-walk.c pathspec: only match across submodule boundaries when requested 2017-12-05 09:23:15 -08:00
tree-walk.h
tree.c
tree.h
unicode_width.h unicode: update the width tables to Unicode 10 2017-07-07 10:33:30 -07:00
unimplemented.sh
unix-socket.c
unix-socket.h
unpack-trees.c cache.h: add GITMODULES_FILE macro 2017-08-02 14:26:46 -07:00
unpack-trees.h
upload-pack.c
url.c
url.h
urlmatch.c urlmatch: use hex2chr() in append_normalized_escapes() 2017-07-09 09:43:01 -07:00
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 Merge branch 'rs/wt-status-cleanup' 2017-07-12 15:18:23 -07:00
wt-status.h Merge branch 'ks/status-initial-commit' 2017-06-30 13:45:22 -07: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-.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