Go to file

Jeff King 0730dd4ffb difftool: avoid strcpy In order to checkout files, difftool reads "diff --raw" output and feeds the names to checkout_entry(). That function requires us to have a "struct cache_entry". And because that struct uses a FLEX_ARRAY for the name field, we have to actually copy in our new name. The current code allocates a single re-usable cache_entry that can hold a name up to PATH_MAX, and then copies filenames into it using strcpy(). But there's no guarantee that incoming names are smaller than PATH_MAX. They've come from "diff --raw" output which might be diffing between two trees (and hence we'd be subject to the PATH_MAX of some other system, or even none at all if they were created directly via "update-index"). We can fix this by using make_cache_entry() to create a correctly-sized cache_entry for each name. This incurs an extra allocation per file, but this is negligible compared to actually writing out the file contents. To make this simpler, we can push this procedure into a new helper function. Note that we can also get rid of the "len" variables for src_path and dst_path (and in fact we must, as the compiler complains that they are unused). Signed-off-by: Jeff King <peff@peff.net> Acked-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>		2017-03-30 13:02:16 -07:00
Documentation	Git 2.11-rc3	2016-11-23 11:24:59 -08:00
block-sha1	…
builtin	difftool: avoid strcpy	2017-03-30 13:02:16 -07:00
ci	…
compat	…
contrib	Merge branch 'da/difftool-dir-diff-fix' into da/t7800-cleanup	2017-02-08 13:36:03 -08:00
ewah	…
git-gui	…
gitk-git	…
gitweb	Merge branch 'ab/gitweb-abbrev-links'	2016-10-26 13:14:46 -07:00
mergetools	…
perl	Merge branch 'svn-cache' of git://bogomips.org/git-svn	2016-10-27 15:04:08 -07:00
po	l10n: Fixed typo of git fetch-pack command	2016-11-22 22:24:59 +08:00
ppc	…
refs	…
t	difftool: handle modified symlinks in dir-diff mode	2017-03-15 12:08:10 -07:00
templates	pre-receive.sample: mark it executable	2016-10-28 14:21:11 -07:00
vcs-svn	…
xdiff	…
.gitattributes	…
.gitignore	difftool: retire the scripted version	2017-01-19 13:23:43 -08:00
.mailmap	…
.travis.yml	Merge branch 'ls/macos-update'	2016-11-11 13:56:30 -08:00
COPYING	…
GIT-VERSION-GEN	Git 2.11-rc3	2016-11-23 11:24:59 -08:00
INSTALL	…
LGPL-2.1	…
Makefile	difftool: retire the scripted version	2017-01-19 13:23:43 -08:00
README.md	…
RelNotes	…
abspath.c	…
aclocal.m4	…
advice.c	…
advice.h	…
alias.c	…
alloc.c	…
apply.c	…
apply.h	…
archive-tar.c	…
archive-zip.c	…
archive.c	archive: read local configuration	2016-11-22 13:55:20 -08:00
archive.h	archive: read local configuration	2016-11-22 13:55:20 -08:00
argv-array.c	…
argv-array.h	…
attr.c	read info/{attributes,exclude} only when in repository	2016-10-26 13:30:51 -07:00
attr.h	…
base85.c	…
bisect.c	…
bisect.h	…
blob.c	…
blob.h	…
branch.c	create_branch: drop unused "head" parameter	2016-11-09 14:56:21 -08:00
branch.h	create_branch: drop unused "head" parameter	2016-11-09 14:56:21 -08:00
builtin.h	difftool: add a skeleton for the upcoming builtin	2017-01-17 13:32:47 -08:00
bulk-checkin.c	…
bulk-checkin.h	…
bundle.c	…
bundle.h	…
cache-tree.c	…
cache-tree.h	…
cache.h	Merge branch 'ls/git-open-cloexec'	2016-10-31 13:15:21 -07:00
check-builtins.sh	…
check-racy.c	…
check_bindir	…
color.c	…
color.h	…
column.c	…
column.h	…
combine-diff.c	diff_aligned_abbrev: use "struct oid"	2016-10-26 13:30:51 -07:00
command-list.txt	…
commit-slab.h	…
commit.c	…
commit.h	…
common-main.c	…
config.c	…
config.mak.in	…
config.mak.uname	…
configure.ac	Merge branch 'dp/autoconf-curl-ssl' into maint	2016-10-28 09:01:13 -07:00
connect.c	Merge branch 'ls/filter-process'	2016-10-31 13:15:21 -07:00
connect.h	…
connected.c	…
connected.h	…
convert.c	Merge branch 'ls/filter-process'	2016-10-31 13:15:21 -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	Merge branch 'ls/filter-process'	2016-10-31 13:15:21 -07:00
date.c	…
decorate.c	…
decorate.h	…
delta.h	…
diff-delta.c	…
diff-lib.c	…
diff-no-index.c	…
diff.c	Merge branch 'tk/diffcore-delta-remove-unused'	2016-11-17 13:45:22 -08:00
diff.h	Merge branch 'nd/ita-empty-commit'	2016-10-27 14:58:50 -07:00
diffcore-break.c	Merge branch 'tk/diffcore-delta-remove-unused'	2016-11-17 13:45:22 -08:00
diffcore-delta.c	Merge branch 'tk/diffcore-delta-remove-unused'	2016-11-17 13:45:22 -08:00
diffcore-order.c	…
diffcore-pickaxe.c	…
diffcore-rename.c	Merge branch 'tk/diffcore-delta-remove-unused'	2016-11-17 13:45:22 -08:00
diffcore.h	Merge branch 'tk/diffcore-delta-remove-unused'	2016-11-17 13:45:22 -08:00
dir-iterator.c	…
dir-iterator.h	…
dir.c	read info/{attributes,exclude} only when in repository	2016-10-26 13:30:51 -07:00
dir.h	…
editor.c	…
entry.c	…
environment.c	Merge branch 'lt/abbrev-auto'	2016-10-27 14:58:47 -07:00
exec_cmd.c	…
exec_cmd.h	…
fast-import.c	…
fetch-pack.c	fetch-pack.c: correct command at the beginning of an error message	2016-11-11 13:28:39 -08:00
fetch-pack.h	…
fmt-merge-msg.h	…
fsck.c	…
fsck.h	…
generate-cmdlist.sh	…
gettext.c	…
gettext.h	…
git-add--interactive.perl	…
git-archimport.perl	…
git-bisect.sh	…
git-compat-util.h	Merge branch 'jk/common-main'	2016-10-31 13:15:23 -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-parse-remote.sh	…
git-quiltimport.sh	…
git-rebase--am.sh	…
git-rebase--interactive.sh	Merge branch 'js/rebase-i-commentchar-fix'	2016-11-23 11:23:17 -08:00
git-rebase--merge.sh	…
git-rebase.sh	…
git-relink.perl	…
git-remote-testgit.sh	…
git-request-pull.sh	…
git-send-email.perl	…
git-sh-i18n.sh	…
git-sh-setup.sh	git-sh-setup: be explicit where to dot-source git-sh-i18n from.	2016-10-30 16:13:49 -07:00
git-stash.sh	…
git-submodule.sh	…
git-svn.perl	…
git-web--browse.sh	…
git.c	difftool: retire the scripted version	2017-01-19 13:23:43 -08:00
git.rc	…
gpg-interface.c	…
gpg-interface.h	…
graph.c	…
graph.h	…
grep.c	…
grep.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	Merge branch 'jc/cocci-xstrdup-or-null' into maint	2016-10-28 09:01: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	…
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.h	…
notes-utils.c	…
notes-utils.h	…
notes.c	…
notes.h	…
object.c	…
object.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	Merge branch 'rs/ring-buffer-wraparound'	2016-10-27 14:58:49 -07:00
pathspec.c	Merge branch 'ex/deprecate-empty-pathspec-as-match-all'	2016-10-26 13:14:56 -07:00
pathspec.h	…
pkt-line.c	…
pkt-line.h	…
preload-index.c	…
pretty.c	Merge branch 'rs/cocci' into maint	2016-10-28 09:01:23 -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	…
ref-filter.c	Merge branch 'jc/for-each-ref-head-segfault-fix'	2016-11-23 11:23:16 -08:00
ref-filter.h	…
reflog-walk.c	…
reflog-walk.h	…
refs.c	…
refs.h	…
remote-curl.c	…
remote-testsvn.c	…
remote.c	…
remote.h	…
replace_object.c	…
rerere.c	…
rerere.h	…
resolve-undo.c	…
resolve-undo.h	…
revision.c	…
revision.h	…
run-command.c	…
run-command.h	…
send-pack.c	…
send-pack.h	…
sequencer.c	Merge branch 'js/prepare-sequencer'	2016-11-22 14:15:38 -08:00
sequencer.h	…
server-info.c	…
setup.c	…
sh-i18n--envsubst.c	…
sha1-array.c	…
sha1-array.h	…
sha1-lookup.c	…
sha1-lookup.h	…
sha1_file.c	Merge branch 'jk/alt-odb-cleanup'	2016-11-10 13:17:30 -08:00
sha1_name.c	Merge branch 'jk/no-looking-at-dotgit-outside-repo'	2016-11-01 12:58:49 -07:00
shallow.c	Merge branch 'ls/filter-process'	2016-10-31 13:15:21 -07:00
shell.c	…
shortlog.h	…
show-index.c	…
sideband.c	…
sideband.h	…
sigchain.c	…
sigchain.h	…
split-index.c	split-index: s/eith/with/ typo fix	2016-11-01 11:48:02 -07:00
split-index.h	…
strbuf.c	…
strbuf.h	…
streaming.c	…
streaming.h	…
string-list.c	…
string-list.h	…
submodule-config.c	…
submodule-config.h	…
submodule.c	Merge branch 'rs/cocci' into maint	2016-10-28 09:01:23 -07:00
submodule.h	…
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	Merge branch 'jt/trailer-with-cruft'	2016-10-31 13:15:22 -07:00
trailer.h	…
transport-helper.c	…
transport.c	Merge branch 'jc/abbrev-auto'	2016-10-27 14:58:48 -07:00
transport.h	Merge branch 'jc/abbrev-auto'	2016-10-27 14:58:48 -07:00
tree-diff.c	…
tree-walk.c	…
tree-walk.h	…
tree.c	…
tree.h	…
unicode_width.h	…
unimplemented.sh	…
unix-socket.c	…
unix-socket.h	…
unpack-trees.c	…
unpack-trees.h	…
update_unicode.sh	…
upload-pack.c	Merge branch 'ls/filter-process'	2016-10-31 13:15:21 -07:00
url.c	…
url.h	…
urlmatch.c	…
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 'nd/ita-empty-commit'	2016-10-27 14:58:50 -07:00
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 http://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 http://news.gmane.org/gmane.comp.version-control.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