kernel/git - git - PowerEL Git System

Go to file

Jeff King dcd1742e56 xdiff: reject files larger than ~1GB The xdiff code is not prepared to handle extremely large files. It uses "int" in many places, which can overflow if we have a very large number of lines or even bytes in our input files. This can cause us to produce incorrect diffs, with no indication that the output is wrong. Or worse, we may even underallocate a buffer whose size is the result of an overflowing addition. We're much better off to tell the user that we cannot diff or merge such a large file. This patch covers both cases, but in slightly different ways: 1. For merging, we notice the large file and cleanly fall back to a binary merge (which is effectively "we cannot merge this"). 2. For diffing, we make the binary/text distinction much earlier, and in many different places. For this case, we'll use the xdi_diff as our choke point, and reject any diff there before it hits the xdiff code. This means in most cases we'll die() immediately after. That's not ideal, but in practice we shouldn't generally hit this code path unless the user is trying to do something tricky. We already consider files larger than core.bigfilethreshold to be binary, so this code would only kick in when that is circumvented (either by bumping that value, or by using a .gitattribute to mark a file as diffable). In other words, we can avoid being "nice" here, because there is already nice code that tries to do the right thing. We are adding the suspenders to the nice code's belt, so notice when it has been worked around (both to protect the user from malicious inputs, and because it is better to die() than generate bogus output). The maximum size was chosen after experimenting with feeding large files to the xdiff code. It's just under a gigabyte, which leaves room for two obvious cases: - a diff3 merge conflict result on files of maximum size X could be 3X plus the size of the markers, which would still be only about 3G, which fits in a 32-bit int. - some of the diff code allocates arrays of one int per record. Even if each file consists only of blank lines, then a file smaller than 1G will have fewer than 1G records, and therefore the int array will fit in 4G. Since the limit is arbitrary anyway, I chose to go under a gigabyte, to leave a safety margin (e.g., we would not want to overflow by allocating "(records + 1) sizeof(int)" or similar. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>		2015-09-28 14:57:23 -07:00
Documentation	Git 2.3.9	2015-09-04 10:32:15 -07:00
block-sha1	…
builtin	react to errors in xdi_diff	2015-09-28 14:57:10 -07:00
compat	Merge branch 'dm/compat-s-ifmt-for-zos'	2014-12-22 12:27:16 -08:00
contrib	Merge branch 'ma/bash-completion-leaking-x' into maint	2015-04-27 12:23:51 -07:00
ewah	Merge branch 'jk/pack-bitmap' into maint	2015-03-05 13:13:02 -08:00
git-gui	…
gitk-git	Merge git://ozlabs.org/~paulus/gitk	2014-10-30 10:07:33 -07:00
gitweb	gitweb: hack around CGI's list-context param() handling	2014-11-18 11:23:10 -08:00
mergetools	mergetools: stop setting $status in merge_cmd()	2014-11-21 11:27:53 -08:00
perl	Merge branch 'ew/svn-maint-fixes' into maint	2015-03-06 14:57:55 -08:00
po	l10n: ca.po: Fix trailing whitespace	2015-01-30 15:02:34 -07:00
ppc	…
t	Merge branch 'mm/usage-log-l-can-take-regex' into maint-2.3	2015-05-11 14:34:01 -07:00
templates	pre-push.sample: remove unnecessary and misleading IFS=' '	2014-12-22 10:27:42 -08:00
vcs-svn	…
xdiff	…
.gitattributes	…
.gitignore	Merge branch 'cc/interpret-trailers'	2014-10-20 12:25:32 -07:00
.mailmap	Update mailmap to spell out "Alexander Kuleshov"	2015-03-27 12:58:18 -07:00
COPYING	…
GIT-VERSION-GEN	Git 2.3.9	2015-09-04 10:32:15 -07:00
INSTALL	git-imap-send: use libcurl for implementation	2014-11-10 09:17:27 -08:00
LGPL-2.1	…
Makefile	Makefile: handle broken curl version number in version check	2015-02-03 18:30:24 -08:00
README	doc: add 'everyday' to 'git help'	2014-10-10 16:02:26 -07:00
RelNotes	Git 2.3.9	2015-09-04 10:32:15 -07:00
abspath.c	abspath: convert absolute_path() to strbuf	2014-08-26 11:06:06 -07:00
aclocal.m4	…
advice.c	merge, pull: stop advising 'commit -a' in case of conflict	2014-08-28 10:29:53 -07:00
advice.h	…
alias.c	…
alloc.c	…
archive-tar.c	Revert "archive: honor tar.umask even for pax headers"	2014-10-20 12:04:46 -07:00
archive-zip.c	zlib: initialize git_zstream in git_deflate_init{,_gzip,_raw}	2015-03-05 15:46:03 -08:00
archive.c	tree.c: update read_tree_recursive callback to pass strbuf as base	2014-12-01 11:32:29 -08:00
archive.h	…
argv-array.c	…
argv-array.h	…
attr.c	use REALLOC_ARRAY for changing the allocation size of arrays	2014-09-18 09:13:42 -07:00
attr.h	…
base85.c	…
bisect.c	Merge branch 'jc/merge-bases'	2015-01-07 12:55:05 -08:00
bisect.h	…
blob.c	…
blob.h	…
branch.c	refs.c: change resolve_ref_unsafe reading argument to be a flags field	2014-10-15 10:47:24 -07:00
branch.h	…
builtin.h	trailer: add interpret-trailers command	2014-10-13 13:55:27 -07:00
bulk-checkin.c	Merge branch 'rs/deflate-init-cleanup' into maint	2015-03-23 11:23:38 -07:00
bulk-checkin.h	cleanups: ensure that git-compat-util.h is included first	2014-09-15 12:05:14 -07:00
bundle.c	bundle: split out ref writing from bundle_create	2014-10-30 14:52:45 -07:00
bundle.h	…
cache-tree.c	Merge branch 'jk/cache-tree-protect-from-broken-libgit2'	2014-11-06 10:51:35 -08:00
cache-tree.h	Merge branch 'dt/cache-tree-repair'	2014-09-11 10:33:32 -07:00
cache.h	Merge branch 'jc/report-path-error-to-dir' into maint	2015-03-31 14:53:08 -07:00
check-builtins.sh	…
check-racy.c	…
check_bindir	…
color.c	parse_color: fix return value for numeric color values 0-8	2015-01-20 15:56:03 -08:00
color.h	parse_color: recognize "no$foo" to clear the $foo attribute	2014-11-20 12:42:55 -08:00
column.c	use child_process_init() to initialize struct child_process variables	2014-10-28 14:56:17 -07:00
column.h	…
combine-diff.c	react to errors in xdi_diff	2015-09-28 14:57:10 -07:00
command-list.txt	Documentation: add documentation for 'git interpret-trailers'	2014-10-13 13:59:49 -07:00
commit-slab.h	use REALLOC_ARRAY for changing the allocation size of arrays	2014-09-18 09:13:42 -07:00
commit.c	Merge branch 'jc/merge-bases'	2015-01-07 12:55:05 -08:00
commit.h	Merge branch 'jc/merge-bases'	2015-01-07 12:55:05 -08:00
config.c	Merge branch 'jk/config-no-ungetc-eof' into maint	2015-03-05 13:13:00 -08:00
config.mak.in	…
config.mak.uname	configure.ac: check for clock_gettime and CLOCK_MONOTONIC	2015-01-09 15:33:39 -08:00
configure.ac	configure.ac: check for HMAC_CTX_cleanup	2015-01-09 15:33:57 -08:00
connect.c	Merge branch 'tb/connect-ipv6-parse-fix' into maint	2015-04-27 12:23:54 -07:00
connect.h	…
connected.c	…
connected.h	…
convert.c	Merge branch 'sp/stream-clean-filter'	2014-10-08 13:05:32 -07:00
convert.h	convert: stream from fd to required clean filter to reduce used address space	2014-08-28 10:25:15 -07:00
copy.c	copy_fd(): do not close the input file descriptor	2014-08-28 10:25:14 -07:00
credential-cache--daemon.c	credential-cache: close stderr in daemon process	2014-09-16 11:11:58 -07:00
credential-cache.c	…
credential-store.c	lockfile.h: extract new header file for the functions in lockfile.c	2014-10-01 13:56:14 -07:00
credential.c	Merge branch 'jk/credential-quit'	2014-12-22 12:27:20 -08:00
credential.h	credential: let helpers tell us to quit	2014-12-04 10:11:12 -08:00
csum-file.c	sha1fd_check: die when we cannot open the file	2015-03-19 13:35:15 -07:00
csum-file.h	Merge branch 'jk/pack-bitmap'	2014-12-12 14:31:42 -08:00
ctype.c	kwset: use unsigned char to store values with high-bit set	2015-03-02 12:32:24 -08:00
daemon.c	Merge branch 'rs/daemon-interpolate' into maint	2015-03-13 22:56:01 -07:00
date.c	Merge branch 'jc/epochtime-wo-tz' into maint-2.3	2015-05-11 14:33:58 -07:00
decorate.c	…
decorate.h	…
delta.h	…
diff-delta.c	…
diff-lib.c	…
diff-no-index.c	diff-no-index: align D/F handling with that of normal Git	2015-03-26 14:08:43 -07:00
diff.c	react to errors in xdi_diff	2015-09-28 14:57:10 -07:00
diff.h	…
diffcore-break.c	diff -B -M: fix output for "copy and then rewrite" case	2014-10-23 16:17:09 -07:00
diffcore-delta.c	…
diffcore-order.c	…
diffcore-pickaxe.c	react to errors in xdi_diff	2015-09-28 14:57:10 -07:00
diffcore-rename.c	Merge branch 'jk/diffcore-rename-duplicate' into maint	2015-03-13 22:56:08 -07:00
diffcore.h	…
dir.c	Merge branch 'jc/report-path-error-to-dir' into maint	2015-03-31 14:53:08 -07:00
dir.h	Merge branch 'jc/report-path-error-to-dir' into maint	2015-03-31 14:53:08 -07:00
editor.c	…
entry.c	…
environment.c	refs: introduce a "ref paranoia" flag	2015-03-20 12:40:49 -07:00
exec_cmd.c	Merge branch 'jc/exec-cmd-system-path-leak-fix'	2014-12-22 12:27:01 -08:00
exec_cmd.h	system_path(): always return free'able memory to the caller	2014-11-30 16:39:47 -08:00
fast-import.c	Merge branch 'rs/deflate-init-cleanup' into maint	2015-03-23 11:23:38 -07:00
fetch-pack.c	fetch-pack: remove dead assignment to ref->new_sha1	2015-03-19 14:11:52 -07:00
fetch-pack.h	…
fmt-merge-msg.h	…
fsck.c	Merge branch 'js/fsck-tag-validation'	2014-12-22 12:27:41 -08:00
fsck.h	fsck_object(): allow passing object data separately from the object itself	2014-09-10 13:54:21 -07:00
generate-cmdlist.sh	…
gettext.c	…
gettext.h	…
git-add--interactive.perl	Merge branch 'ak/add-i-empty-candidates' into maint	2015-02-24 22:10:42 -08:00
git-am.sh	git-am: add --message-id/--no-message-id	2014-11-25 15:27:01 -08:00
git-archimport.perl	…
git-bisect.sh	bisect: parse revs before passing them to check_expected_revs()	2014-12-29 11:19:55 -08:00
git-compat-util.h	Merge branch 'bw/kwset-use-unsigned' into maint	2015-03-13 22:56:07 -07:00
git-cvsexportcommit.perl	…
git-cvsimport.perl	…
git-cvsserver.perl	…
git-difftool--helper.sh	difftool--helper: add explicit exit statement	2014-11-21 11:27:53 -08:00
git-difftool.perl	Merge branch 'da/difftool'	2014-10-29 10:09:35 -07:00
git-filter-branch.sh	…
git-instaweb.sh	…
git-merge-octopus.sh	…
git-merge-one-file.sh	…
git-merge-resolve.sh	…
git-mergetool--lib.sh	mergetool--lib: remove use of $status global	2014-11-21 11:27:53 -08:00
git-mergetool.sh	mergetool: simplify conditionals	2014-11-21 11:27:53 -08:00
git-p4.py	…
git-parse-remote.sh	…
git-pull.sh	merge, pull: stop advising 'commit -a' in case of conflict	2014-08-28 10:29:53 -07:00
git-quiltimport.sh	…
git-rebase--am.sh	…
git-rebase--interactive.sh	Merge branch 'es/rebase-i-count-todo' into maint	2015-03-23 11:23:17 -07:00
git-rebase--merge.sh	…
git-rebase.sh	…
git-relink.perl	…
git-remote-testgit.sh	transport-helper: do not request symbolic refs to remote helpers	2015-01-21 22:46:59 -08:00
git-request-pull.sh	…
git-send-email.perl	git-send-email.perl: support no- prefix with older GetOptions	2015-02-16 13:26:51 -08:00
git-sh-i18n.sh	…
git-sh-setup.sh	Merge branch 'dw/shell-basename-dashdash-before-stripping-leading-dash-from-login'	2014-12-22 12:26:48 -08:00
git-stash.sh	Merge branch 'da/rev-parse-verify-quiet'	2014-09-29 12:36:10 -07:00
git-submodule.sh	Merge branch 'ps/submodule-sanitize-path-upon-add' into maint	2015-03-05 13:13:10 -08:00
git-svn.perl	git-svn: make it play nicely with submodules	2015-01-15 08:35:55 +00:00
git-web--browse.sh	…
git.c	Merge branch 'ak/git-done-help-cleanup' into maint	2015-03-23 11:23:35 -07:00
git.rc	…
git.spec.in	…
gpg-interface.c	Merge branch 'jc/push-cert'	2014-10-08 13:05:25 -07:00
gpg-interface.h	gpg-interface: move parse_signature() to where it should be	2014-09-15 13:23:20 -07:00
graph.c	Merge branch 'rs/graph-simplify'	2014-09-29 12:36:11 -07:00
graph.h	…
grep.c	Merge branch 'jk/blame-commit-label' into maint	2015-02-24 22:09:54 -08:00
grep.h	grep: add color.grep.matchcontext and color.grep.matchselected	2014-10-28 10:33:50 -07:00
hashmap.c	…
hashmap.h	…
help.c	Merge branch 'sb/help-unknown-command-sort-fix'	2014-09-26 14:39:49 -07:00
help.h	…
hex.c	Merge branch 'sb/hex-object-name-is-at-most-41-bytes-long' into maint	2015-03-05 13:12:55 -08:00
http-backend.c	Merge branch 'rs/run-command-env-array'	2014-10-24 14:57:54 -07:00
http-fetch.c	…
http-push.c	Merge branch 'rs/deflate-init-cleanup' into maint	2015-03-23 11:23:38 -07:00
http-walker.c	http-walker: simplify process_alternates_response() using strbuf	2014-09-02 10:57:14 -07:00
http.c	Merge branch 'jk/dumb-http-idx-fetch-fix' into maint	2015-02-24 22:10:37 -08:00
http.h	…
ident.c	Merge branch 'jk/commit-author-parsing'	2014-09-19 11:38:33 -07:00
imap-send.c	imap-send: use cURL automatically when NO_OPENSSL defined	2015-03-10 15:19:05 -07:00
khash.h	use REALLOC_ARRAY for changing the allocation size of arrays	2014-09-18 09:13:42 -07:00
kwset.c	kwset: use unsigned char to store values with high-bit set	2015-03-02 12:32:24 -08:00
kwset.h	kwset: use unsigned char to store values with high-bit set	2015-03-02 12:32:24 -08:00
levenshtein.c	…
levenshtein.h	…
line-log.c	react to errors in xdi_diff	2015-09-28 14:57:10 -07:00
line-log.h	…
line-range.c	…
line-range.h	…
list-objects.c	rev-list: add an option to mark fewer edges as uninteresting	2014-12-29 09:57:55 -08:00
list-objects.h	…
ll-merge.c	xdiff: reject files larger than ~1GB	2015-09-28 14:57:23 -07:00
ll-merge.h	…
lockfile.c	lockfile.c: store absolute path	2014-11-03 11:00:28 -08:00
lockfile.h	lockfile: remove unable_to_lock_error	2014-10-15 10:47:27 -07:00
log-tree.c	Merge branch 'jc/decorate-leaky-separator-color' into maint	2015-03-23 11:23:28 -07:00
log-tree.h	Merge branch 'jn/parse-config-slot'	2014-10-20 12:23:48 -07:00
mailmap.c	mailmap: use higher level string list functions	2014-12-04 15:10:21 -08:00
mailmap.h	…
match-trees.c	…
merge-blobs.c	…
merge-blobs.h	…
merge-recursive.c	Merge branch 'jc/merge-bases'	2015-01-07 12:55:05 -08:00
merge-recursive.h	…
merge.c	lockfile.h: extract new header file for the functions in lockfile.c	2014-10-01 13:56:14 -07:00
mergesort.c	…
mergesort.h	…
name-hash.c	…
notes-cache.c	…
notes-cache.h	…
notes-merge.c	Merge branch 'jc/merge-bases'	2015-01-07 12:55:05 -08:00
notes-merge.h	…
notes-utils.c	use strbuf_complete_line() for adding a newline if needed	2014-12-12 11:23:45 -08:00
notes-utils.h	…
notes.c	Sync with 2.2.3	2015-09-04 10:29:28 -07:00
notes.h	…
object.c	drop add_object_array_with_mode	2014-10-19 15:28:30 -07:00
object.h	drop add_object_array_with_mode	2014-10-19 15:28:30 -07:00
pack-bitmap-write.c	Merge branch 'jk/pack-bitmap'	2014-12-12 14:31:42 -08:00
pack-bitmap.c	Merge branch 'jk/pack-bitmap'	2014-12-12 14:31:42 -08:00
pack-bitmap.h	pack-bitmap: do not use gcc packed attribute	2014-11-30 18:07:34 -08:00
pack-check.c	…
pack-objects.c	use REALLOC_ARRAY for changing the allocation size of arrays	2014-09-18 09:13:42 -07:00
pack-objects.h	…
pack-revindex.c	…
pack-revindex.h	…
pack-write.c	pack-write: simplify index_pack_lockfile using skip_prefix() and xstrfmt()	2014-09-02 10:37:24 -07:00
pack.h	…
pager.c	Merge branch 'jk/decimal-width-for-uintmax' into maint	2015-03-05 13:12:59 -08:00
parse-options-cb.c	…
parse-options.c	Merge branch 'jc/parseopt-verify-short-name'	2014-09-19 11:38:38 -07:00
parse-options.h	Merge branch 'iu/fix-parse-options-h-comment' into maint	2015-04-21 12:12:20 -07:00
patch-delta.c	…
patch-ids.c	…
patch-ids.h	…
path.c	Merge branch 'pt/enter-repo-comment-fix' into maint	2015-04-21 12:12:23 -07:00
pathspec.c	…
pathspec.h	…
pkt-line.c	pkt-line: allow writing of LARGE_PACKET_MAX buffers	2014-12-10 13:09:21 -08:00
pkt-line.h	…
preload-index.c	…
pretty.c	Merge branch 'rs/simple-cleanups' into maint	2015-03-06 14:57:57 -08:00
prio-queue.c	…
prio-queue.h	…
progress.c	…
progress.h	…
prompt.c	Merge branch 'jk/credential-quit'	2014-12-22 12:27:20 -08:00
prompt.h	…
quote.c	ls-tree: remove path filtering logic in show_tree	2014-12-01 11:32:34 -08:00
quote.h	ls-tree: remove path filtering logic in show_tree	2014-12-01 11:32:34 -08:00
reachable.c	reachable: use revision machinery's --indexed-objects code	2014-10-19 15:07:07 -07:00
reachable.h	pack-objects: match prune logic for discarding objects	2014-10-16 10:10:43 -07:00
read-cache.c	Merge branch 'tg/fix-check-order-with-split-index' into maint	2015-03-28 09:33:07 -07:00
reflog-walk.c	refs.c: change resolve_ref_unsafe reading argument to be a flags field	2014-10-15 10:47:24 -07:00
reflog-walk.h	stylefix: asterisks stick to the variable, not the type	2014-09-02 11:33:32 -07:00
refs.c	refs.c: drop curate_packed_refs	2015-03-20 12:41:41 -07:00
refs.h	repack_without_refs(): make the refnames argument a string_list	2014-11-25 10:09:58 -08:00
remote-curl.c	Merge branch 'rs/deflate-init-cleanup' into maint	2015-03-23 11:23:38 -07:00
remote-testsvn.c	…
remote.c	Merge branch 'jk/blame-commit-label' into maint	2015-02-24 22:09:54 -08:00
remote.h	…
replace_object.c	…
rerere.c	Merge branch 'jn/rerere-fail-on-auto-update-failure' into maint	2015-02-24 22:10:13 -08:00
rerere.h	rerere.h: mark string for translation	2014-09-15 11:29:46 -07:00
resolve-undo.c	…
resolve-undo.h	…
revision.c	Merge branch 'bc/fetch-thin-less-aggressive-in-normal-repository'	2015-01-12 11:38:57 -08:00
revision.h	rev-list: add an option to mark fewer edges as uninteresting	2014-12-29 09:57:55 -08:00
run-command.c	Merge branch 'jc/hook-cleanup'	2014-12-22 12:27:10 -08:00
run-command.h	Merge branch 'jc/hook-cleanup'	2014-12-22 12:27:10 -08:00
send-pack.c	Merge branch 'jc/push-cert' into maint	2015-04-27 12:23:50 -07:00
send-pack.h	signed push: add "pushee" header to push certificate	2014-09-15 13:23:28 -07:00
sequencer.c	Merge branch 'cc/interpret-trailers-more'	2014-12-22 12:26:24 -08:00
sequencer.h	Merge branch 'jc/conflict-hint' into cc/interpret-trailers-more	2014-11-10 09:56:39 -08:00
server-info.c	update-server-info: create info/* with mode 0666	2015-01-06 13:46:52 -08:00
setup.c	Merge branch 'rs/strbuf-getcwd'	2014-09-02 13:28:44 -07:00
sh-i18n--envsubst.c	use REALLOC_ARRAY for changing the allocation size of arrays	2014-09-18 09:13:42 -07:00
sha1-array.c	…
sha1-array.h	…
sha1-lookup.c	sha1-lookup: handle duplicates in sha1_pos()	2014-10-01 13:32:19 -07:00
sha1-lookup.h	…
sha1_file.c	Sync with 2.2.3	2015-09-04 10:29:28 -07:00
sha1_name.c	Merge branch 'rs/use-isxdigit' into maint	2015-03-23 11:23:41 -07:00
shallow.c	Merge branch 'jk/blame-commit-label' into maint	2015-02-24 22:09:54 -08:00
shell.c	…
shortlog.h	…
show-index.c	…
sideband.c	…
sideband.h	…
sigchain.c	cleanups: ensure that git-compat-util.h is included first	2014-09-15 12:05:14 -07:00
sigchain.h	…
split-index.c	…
split-index.h	…
strbuf.c	Merge branch 'jc/strbuf-add-lines-avoid-sp-ht-sequence'	2015-01-07 12:49:19 -08:00
strbuf.h	Merge branch 'rs/export-strbuf-addchars'	2014-09-19 11:38:39 -07:00
streaming.c	…
streaming.h	…
string-list.c	Merge branch 'sb/string-list'	2014-12-22 12:27:30 -08:00
string-list.h	Merge branch 'sb/string-list'	2014-12-22 12:27:30 -08:00
submodule.c	Merge branch 'jc/merge-bases'	2015-01-07 12:55:05 -08:00
submodule.h	…
symlinks.c	…
tag.c	gpg-interface: move parse_signature() to where it should be	2014-09-15 13:23:20 -07:00
tag.h	gpg-interface: move parse_signature() to where it should be	2014-09-15 13:23:20 -07:00
tar.h	…
test-chmtime.c	…
test-config.c	…
test-ctype.c	…
test-date.c	date: use strbufs in date-formatting functions	2014-08-27 10:32:56 -07:00
test-delta.c	…
test-dump-cache-tree.c	Merge branch 'dt/cache-tree-repair'	2014-09-11 10:33:32 -07:00
test-dump-split-index.c	…
test-genrandom.c	…
test-hashmap.c	Merge branch 'js/test-hashmap-squelch-gcc'	2014-12-22 12:27:46 -08:00
test-index-version.c	…
test-line-buffer.c	…
test-match-trees.c	…
test-mergesort.c	…
test-mktemp.c	…
test-parse-options.c	…
test-path-utils.c	…
test-prio-queue.c	…
test-read-cache.c	…
test-regex.c	cleanups: ensure that git-compat-util.h is included first	2014-09-15 12:05:14 -07:00
test-revision-walking.c	…
test-run-command.c	…
test-scrap-cache-tree.c	lockfile.h: extract new header file for the functions in lockfile.c	2014-10-01 13:56:14 -07:00
test-sha1-array.c	sha1-array: add test-sha1-array and basic tests	2014-10-01 13:32:10 -07:00
test-sha1.c	…
test-sha1.sh	…
test-sigchain.c	cleanups: ensure that git-compat-util.h is included first	2014-09-15 12:05:14 -07:00
test-string-list.c	…
test-subprocess.c	…
test-svn-fe.c	…
test-urlmatch-normalization.c	…
test-wildmatch.c	…
thread-utils.c	…
thread-utils.h	pack-objects: set number of threads before checking and warning	2014-10-13 12:53:46 -07:00
trace.c	configure.ac: check for clock_gettime and CLOCK_MONOTONIC	2015-01-09 15:33:39 -08:00
trace.h	…
trailer.c	do not include the same header twice	2015-02-13 13:16:12 -08:00
trailer.h	trailer: put all the processing together and print	2014-10-13 13:55:27 -07:00
transport-helper.c	Merge branch 'jc/push-cert' into maint	2015-03-05 13:12:58 -08:00
transport.c	Merge branch 'jk/fetch-pack' into maint	2015-03-28 09:33:08 -07:00
transport.h	push: the beginning of "git push --signed"	2014-09-15 13:23:20 -07:00
tree-diff.c	…
tree-walk.c	…
tree-walk.h	…
tree.c	tree.c: update read_tree_recursive callback to pass strbuf as base	2014-12-01 11:32:29 -08:00
tree.h	tree.c: update read_tree_recursive callback to pass strbuf as base	2014-12-01 11:32:29 -08:00
unicode_width.h	…
unimplemented.sh	…
unix-socket.c	Merge branch 'rs/strbuf-getcwd'	2014-09-02 13:28:44 -07:00
unix-socket.h	…
unpack-trees.c	Sync with 2.2.3	2015-09-04 10:29:28 -07:00
unpack-trees.h	…
update_unicode.sh	update_unicode.sh: delete the command group	2014-12-22 10:03:37 -08:00
upload-pack.c	Merge branch 'jk/smart-http-hide-refs' into maint	2015-03-27 13:00:21 -07:00
url.c	…
url.h	…
urlmatch.c	isxdigit: cast input to unsigned char	2014-10-16 10:10:36 -07:00
urlmatch.h	…
usage.c	…
userdiff.c	do not include the same header twice	2015-02-13 13:16:12 -08:00
userdiff.h	…
utf8.c	Merge branch 'maint-2.1' into maint	2015-01-07 13:28:10 -08:00
utf8.h	utf8: add is_hfs_dotgit() helper	2014-12-17 11:04:39 -08:00
varint.c	cleanups: ensure that git-compat-util.h is included first	2014-09-15 12:05:14 -07:00
varint.h	cleanups: ensure that git-compat-util.h is included first	2014-09-15 12:05:14 -07:00
version.c	…
version.h	…
versioncmp.c	…
walker.c	Merge branch 'jk/blame-commit-label' into maint	2015-02-24 22:09:54 -08:00
walker.h	…
wildmatch.c	…
wildmatch.h	…
wrap-for-bin.sh	…
wrapper.c	wrapper.c: add a new function unlink_or_msg	2014-10-15 10:47:21 -07:00
write_or_die.c	refs: write packed_refs file using stdio	2014-09-10 10:58:32 -07:00
ws.c	…
wt-status.c	Merge branch 'jk/status-read-branch-name-fix' into maint	2015-02-24 22:10:22 -08:00
wt-status.h	…
xdiff-interface.c	xdiff: reject files larger than ~1GB	2015-09-28 14:57:23 -07:00
xdiff-interface.h	xdiff: reject files larger than ~1GB	2015-09-28 14:57:23 -07:00
zlib.c	zlib: initialize git_zstream in git_deflate_init{,_gzip,_raw}	2015-03-05 15:46:03 -08:00

README

////////////////////////////////////////////////////////////////

	Git - the stupid content tracker

////////////////////////////////////////////////////////////////

"git" can mean anything, 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

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.

See Documentation/gittutorial.txt to get started, then see
Documentation/giteveryday.txt for a useful minimum set of commands, and
Documentation/git-commandname.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).

Many Git online resources are accessible from http://git-scm.com/
including full documentation and Git related tools.

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.