Go to file

Brandon Williams fd66bcc31f diff-tree: read the index so attribute checks work in bare repositories A regression was introduced in `557a5998d` (submodule: remove gitmodules_config, 2017-08-03) to how attribute processing was handled in bare repositories when running the diff-tree command. By default the attribute system will first try to read ".gitattribute" files from the working tree and then falls back to reading them from the index if there isn't a copy checked out in the worktree. Prior to `557a5998d` the index was read as a side effect of the call to 'gitmodules_config()' which ensured that the index was already populated before entering the attribute subsystem. Since the call to 'gitmodules_config()' was removed the index is no longer being read so when the attribute system tries to read from the in-memory index it doesn't find any ".gitattribute" entries effectively ignoring any configured attributes. Fix this by explicitly reading the index during the setup of diff-tree. Reported-by: Ben Boeckel <ben.boeckel@kitware.com> Signed-off-by: Brandon Williams <bmwill@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>		2017-12-06 14:49:18 -08:00
.github	…
Documentation	Merge branch 'bw/grep-recurse-submodules' into bw/submodule-config-cleanup	2017-08-02 14:33:47 -07:00
block-sha1	…
builtin	diff-tree: read the index so attribute checks work in bare repositories	2017-12-06 14:49:18 -08:00
ci	…
compat	Merge branch 'tb/push-to-cygwin-unc-path'	2017-07-18 12:48:09 -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: git.pot: v2.14.0 round 2 (9 new, 2 removed)	2017-07-24 22:00:44 +08: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	diff-tree: read the index so attribute checks work in bare repositories	2017-12-06 14:49:18 -08:00
templates	pre-rebase hook: capture documentation in a <<here document	2017-07-11 08:56:33 -07:00
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-rc1	2017-07-24 14:50:35 -07:00
INSTALL	…
LGPL-2.1	…
Makefile	Merge branch 'jc/po-pritime-fix'	2017-07-21 14:57:37 -07:00
README.md	…
RelNotes	fixes from 'master' for 2.13.4	2017-07-21 15:06:09 -07:00
abspath.c	Spelling fixes	2017-06-27 10:35:49 -07:00
aclocal.m4	…
advice.c	Merge branch 'jk/warn-add-gitlink'	2017-06-24 14:28:41 -07:00
advice.h	…
alias.c	Merge branch 'js/alias-case-sensitivity'	2017-07-20 16:29:59 -07:00
alloc.c	…
apply.c	sha1_name: convert get_sha1* to get_oid*	2017-07-17 13:54:51 -07:00
apply.h	…
archive-tar.c	Merge branch 'bw/config-h'	2017-06-24 14:28:41 -07:00
archive-zip.c	Merge branch 'bw/config-h'	2017-06-24 14:28:41 -07:00
archive.c	sha1_name: convert get_sha1* to get_oid*	2017-07-17 13:54:51 -07:00
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: convert bisect_checkout to struct object_id	2017-07-17 13:54:38 -07:00
bisect.h	…
blame.c	Merge branch 'ab/free-and-null'	2017-06-24 14:28:41 -07:00
blame.h	…
blob.c	…
blob.h	…
branch.c	Merge branch 'ab/free-and-null'	2017-06-24 14:28:41 -07:00
branch.h	…
builtin.h	…
bulk-checkin.c	…
bulk-checkin.h	…
bundle.c	…
bundle.h	…
cache-tree.c	…
cache-tree.h	…
cache.h	Merge branch 'bc/object-id' into bw/submodule-config-cleanup	2017-08-02 14:34:28 -07:00
check-builtins.sh	…
check-racy.c	…
check_bindir	…
color.c	…
color.h	…
column.c	…
column.h	…
combine-diff.c	Merge branch 'bw/ls-files-sans-the-index'	2017-06-24 14:28:40 -07:00
command-list.txt	…
commit-slab.h	…
commit.c	sha1_name: convert get_sha1* to get_oid*	2017-07-17 13:54:51 -07:00
commit.h	commit: convert lookup_commit_graft to struct object_id	2017-07-13 12:02:40 -07:00
common-main.c	…
config.c	Merge branch 'bc/object-id' into bw/submodule-config-cleanup	2017-08-02 14:34:28 -07:00
config.h	Merge branch 'bc/object-id' into bw/submodule-config-cleanup	2017-08-02 14:34:28 -07:00
config.mak.in	…
config.mak.uname	config.mak.uname: set FREAD_READS_DIRECTORIES for cygwin	2017-07-21 11:58:06 -07:00
configure.ac	Merge branch 'nd/fopen-errors'	2017-06-22 14:15:20 -07:00
connect.c	Merge branch 'bw/config-h'	2017-06-24 14:28:41 -07:00
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	Merge branch 'bw/config-h'	2017-06-24 14:28:41 -07:00
credential-cache.c	…
credential-store.c	…
credential.c	Merge branch 'ab/free-and-null'	2017-06-24 14:28:41 -07:00
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	Merge branch 'ab/free-and-null'	2017-06-24 14:28:41 -07:00
diff-no-index.c	…
diff.c	diff: stop allowing diff to have submodules configured in .git/config	2017-08-03 13:11:01 -07:00
diff.h	Merge branch 'bw/object-id'	2017-06-19 12:38:44 -07:00
diffcore-break.c	…
diffcore-delta.c	…
diffcore-order.c	wildmatch: remove unused wildopts parameter	2017-06-23 18:27:07 -07:00
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	Merge branch 'pc/dir-count-slashes'	2017-06-22 14:15:21 -07:00
editor.c	…
entry.c	…
environment.c	Merge branch 'bw/config-h'	2017-06-24 14:28:41 -07:00
exec_cmd.c	…
exec_cmd.h	…
fast-import.c	Merge branch 'ab/free-and-null'	2017-06-24 14:28:41 -07:00
fetch-pack.c	Merge branch 'bw/config-h'	2017-06-24 14:28:41 -07:00
fetch-pack.h	…
fmt-merge-msg.h	…
fsck.c	commit: convert lookup_commit_graft to struct object_id	2017-07-13 12:02:40 -07:00
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	Merge branch 'tb/push-to-cygwin-unc-path'	2017-07-18 12:48:09 -07: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	…
git-mergetool.sh	…
git-p4.py	git-p4: filter for {'code':'info'} in p4CmdList	2017-07-13 10:52:42 -07:00
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	Merge branch 'ab/free-and-null'	2017-06-24 14:28:41 -07:00
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	Merge branch 'bw/config-h'	2017-06-24 14:28:41 -07:00
http-fetch.c	…
http-push.c	…
http-walker.c	…
http.c	Merge branch 'ab/free-and-null'	2017-06-24 14:28:41 -07:00
http.h	…
ident.c	Merge branch 'bw/config-h'	2017-06-24 14:28:41 -07:00
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	Merge branch 'ab/free-and-null'	2017-06-24 14:28:41 -07:00
line-log.h	…
line-range.c	…
line-range.h	…
list-objects.c	…
list-objects.h	…
list.h	…
ll-merge.c	Merge branch 'ab/free-and-null'	2017-06-24 14:28:41 -07:00
ll-merge.h	…
lockfile.c	…
lockfile.h	…
log-tree.c	Merge branch 'bw/config-h'	2017-06-24 14:28:41 -07:00
log-tree.h	…
mailinfo.c	Spelling fixes	2017-06-27 10:35:49 -07:00
mailinfo.h	…
mailmap.c	Convert remaining callers of get_sha1 to get_oid.	2017-07-17 13:54:51 -07:00
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	Merge branch 'bw/config-h'	2017-06-24 14:28:41 -07:00
notes-utils.h	…
notes.c	sha1_name: convert get_sha1* to get_oid*	2017-07-17 13:54:51 -07:00
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	Merge branch 'bw/config-h'	2017-06-24 14:28:41 -07:00
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: add repo_worktree_path and strbuf_repo_worktree_path	2017-06-23 18:24:34 -07:00
path.h	path: add repo_worktree_path and strbuf_repo_worktree_path	2017-06-23 18:24:34 -07:00
pathspec.c	Spelling fixes	2017-06-27 10:35:49 -07:00
pathspec.h	…
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: show overall rate in last update	2017-07-09 09:54:20 -07:00
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 'bc/object-id' into bw/submodule-config-cleanup	2017-08-02 14:34:28 -07:00
refs.h	Spelling fixes	2017-06-27 10:35:49 -07:00
remote-curl.c	…
remote-testsvn.c	Merge branch 'ab/free-and-null'	2017-06-24 14:28:41 -07:00
remote.c	Merge branch 'bc/object-id' into bw/submodule-config-cleanup	2017-08-02 14:34:28 -07:00
remote.h	remote: convert struct push_cas to struct object_id	2017-07-17 13:54:38 -07:00
replace_object.c	…
repository.c	Merge branch 'bc/object-id' into bw/submodule-config-cleanup	2017-08-02 14:34:28 -07:00
repository.h	repo_read_index: don't discard the index	2017-07-18 13:32:25 -07:00
rerere.c	Merge branch 'ab/free-and-null'	2017-06-24 14:28:41 -07:00
rerere.h	…
resolve-undo.c	…
resolve-undo.h	…
revision.c	Merge branch 'bc/object-id' into bw/submodule-config-cleanup	2017-08-02 14:34:28 -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	sha1_name: convert get_sha1* to get_oid*	2017-07-17 13:54:51 -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 'ew/fd-cloexec-fix' into maint	2017-07-21 15:03:40 -07:00
sha1_name.c	sha1_name: convert uses of 40 to GIT_SHA1_HEXSZ	2017-07-17 13:54:51 -07:00
sha1dc_git.c	…
sha1dc_git.h	…
shallow.c	commit: convert lookup_commit_graft to struct object_id	2017-07-13 12:02:40 -07:00
shell.c	…
shortlog.h	…
show-index.c	…
sideband.c	…
sideband.h	…
sigchain.c	…
sigchain.h	…
split-index.c	Merge branch 'ab/free-and-null'	2017-06-24 14:28:41 -07:00
split-index.h	Revert "split-index: add and use unshare_split_index()"	2017-06-24 12:02:39 -07:00
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-config: lazy-load a repository's .gitmodules file	2017-08-03 13:11:01 -07:00
submodule-config.h	submodule-config: move submodule-config functions to submodule-config.c	2017-08-03 13:11:01 -07:00
submodule.c	submodule: remove gitmodules_config	2017-08-03 13:11:02 -07:00
submodule.h	submodule: remove gitmodules_config	2017-08-03 13:11:02 -07:00
symlinks.c	…
tag.c	tag: convert gpg_verify_tag to use struct object_id	2017-07-13 12:02:48 -07:00
tag.h	tag: convert gpg_verify_tag to use struct object_id	2017-07-13 12:02:48 -07: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	sha1_name: convert get_sha1* to get_oid*	2017-07-17 13:54:51 -07:00
transport.c	Merge branch 'ab/free-and-null'	2017-06-24 14:28:41 -07:00
transport.h	…
tree-diff.c	Merge branch 'ab/free-and-null'	2017-06-24 14:28:41 -07:00
tree-walk.c	Merge branch 'jk/diff-blob' into maint	2017-06-24 15:29:28 -07:00
tree-walk.h	…
tree.c	Merge branch 'ab/free-and-null'	2017-06-24 14:28:41 -07:00
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	unpack-trees: improve loading of .gitmodules	2017-08-03 13:11:02 -07:00
unpack-trees.h	…
upload-pack.c	Merge branch 'bw/config-h'	2017-06-24 14:28:41 -07:00
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	die(): stop hiding errors due to overzealous recursion guard	2017-06-21 14:09:13 -07:00
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: remove unused wildopts parameter	2017-06-23 18:27:07 -07:00
wildmatch.h	wildmatch: remove unused wildopts parameter	2017-06-23 18:27:07 -07:00
worktree.c	path: convert strbuf_git_common_path to take a 'struct repository'	2017-06-23 18:24:34 -07:00
worktree.h	…
wrap-for-bin.sh	…
wrapper.c	Merge branch 'bw/config-h'	2017-06-24 14:28:41 -07:00
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	Merge branch 'bw/config-h'	2017-06-24 14:28:41 -07: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-.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