1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-05 00:37:55 +01:00
Find a file
Johannes Sixt 09c9957cf7 send-pack: avoid deadlock when pack-object dies early
Send-pack deadlocks in two ways when pack-object dies early (for example,
because there is some repo corruption).

The first deadlock happens with the smart push protocol (--stateless-rpc).
After the initial rev-exchange, the remote is waiting for the pack data
to arrive, and the sideband demuxer at the local side continues trying to
stream data from the remote repository until it gets EOF. Meanwhile,
send-pack (in function pack_objects()) has noticed that pack-objects did
not produce output and died. Back in send_pack(), it now tries to clean
up the sideband demuxer using finish_async(). The demuxer, however, waits
for the remote end to close down, the remote waits for pack data, and
the reason that it still waits is that send-pack forgot to close the
outgoing channel. Add the missing close() in pack_objects().

The second deadlock happens in a similar constellation when the sideband
demuxer runs in a forked process (rather than in a thread). Again, the
remote end waits for pack data to arrive, the sideband demuxer waits for
the remote to shut down, and send-pack (in the regular clean-up) waits for
the demuxer to terminate. This time, the send-pack parent process closes
the writable end of the outgoing channel (in start_command() that spawned
pack-objects) so that after the death of the pack-objects process all
writable ends should have been closed and the remote repo should see EOF.
This does not happen, however, because when the sideband demuxer was forked
earlier, it also inherited a writable end; it remains open and keeps the
remote repo from seeing EOF. To break this deadlock, close the writable end
in the demuxer.

Analyzed-by: Jeff King <peff@peff.net>
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-04-25 15:13:24 -07:00
block-sha1 remove ARM and Mozilla SHA1 implementations 2009-08-18 14:19:40 -07:00
compat Explicitly truncate bswap operand to uint32_t 2009-11-25 00:16:38 -08:00
contrib bash: don't offer remote transport helpers as subcommands 2010-01-28 12:36:12 -08:00
Documentation run-command: support custom fd-set in async 2010-02-05 20:57:22 -08:00
git-gui Merge branch 'maint' of git://git.spearce.org/git-gui into maint 2010-01-24 11:16:26 -08:00
gitk-git Merge git://git.kernel.org/pub/scm/gitk/gitk 2009-12-09 15:38:42 -08:00
gitweb gitweb: Describe (possible) gitweb.js minification in gitweb/README 2009-12-03 12:38:45 -08:00
perl perl/Makefile.PL: detect MakeMaker versions incompatible with DESTDIR 2009-09-25 14:00:04 -07:00
ppc
t Merge branch 'jc/maint-limit-note-output' into maint 2010-02-05 10:59:05 -08:00
templates Merge branch 'bs/maint-pre-commit-hook-sample' into maint 2009-11-16 00:03:15 -08:00
xdiff Merge branch 'tf/diff-whitespace-incomplete-line' into maint 2009-09-16 14:27:08 -07:00
.gitattributes .gitattributes: CR at the end of the line is an error 2009-06-21 10:42:37 -07:00
.gitignore Merge branch 'jh/notes' (early part) 2009-11-20 23:53:55 -08:00
.mailmap Nicolas Pitre has a new email address 2009-09-14 02:23:36 -07:00
abspath.c abspath.c: move declaration of 'len' into inner block and use appropriate type 2009-08-27 16:20:53 -07:00
advice.c merge-recursive: point the user to commit when file would be overwritten. 2009-11-22 16:07:27 -08:00
advice.h merge-recursive: point the user to commit when file would be overwritten. 2009-11-22 16:07:27 -08:00
alias.c Merge branch 'jk/maint-1.6.0-trace-argv' into maint 2009-05-25 19:03:20 -07:00
alloc.c Fix a bunch of pointer declarations (codestyle) 2009-05-01 15:17:31 -07:00
archive-tar.c archive-tar.c: squelch a type mismatch warning 2009-05-08 23:57:29 -07:00
archive-zip.c
archive.c Refactor pretty_print_commit arguments into a struct 2009-10-19 22:28:20 -07:00
archive.h archive: do not read .gitattributes in working directory 2009-04-17 21:05:49 -07:00
attr.c attr: plug minor memory leak 2009-06-30 16:12:24 -07:00
attr.h attr: add GIT_ATTR_INDEX "direction" 2009-04-17 21:05:49 -07:00
base85.c Merge branch 'maint-1.6.2' into maint-1.6.3 2010-01-18 21:29:47 -08:00
bisect.c bisect: fix singular/plural grammar nit 2010-01-19 12:50:48 -08:00
bisect.h bisect: add parameters to "filter_skipped" 2009-06-06 11:26:56 -07:00
blob.c
blob.h
branch.c Convert existing die(..., strerror(errno)) to die_errno() 2009-06-27 11:14:53 -07:00
branch.h Make git-clone respect branch.autosetuprebase 2009-03-03 22:58:52 -08:00
builtin-add.c don't dereference NULL upon fdopen failure 2009-09-13 01:32:20 -07:00
builtin-annotate.c
builtin-apply.c builtin-apply.c: pay attention to -p<n> when determining the name 2009-11-26 19:02:24 -08:00
builtin-archive.c Fix archive format with -- on the command line 2009-12-10 15:29:05 -08:00
builtin-bisect--helper.c parse-opts: prepare for OPT_FILENAME 2009-05-25 01:07:25 -07:00
builtin-blame.c Merge branch 'maint' 2009-12-22 12:32:39 -08:00
builtin-branch.c Merge branch 'maint-1.6.4' into maint-1.6.5 2010-01-18 21:37:12 -08:00
builtin-bundle.c Update the usage bundle string. 2009-09-18 19:47:15 -07:00
builtin-cat-file.c Merge branch 'sb/opt-filename' 2009-05-31 16:57:42 -07:00
builtin-check-attr.c parse-opts: prepare for OPT_FILENAME 2009-05-25 01:07:25 -07:00
builtin-check-ref-format.c check-ref-format -h: it does not know the --print option yet 2009-11-10 20:45:23 -08:00
builtin-checkout-index.c parse-opts: prepare for OPT_FILENAME 2009-05-25 01:07:25 -07:00
builtin-checkout.c Merge branch 'maint-1.6.4' into maint-1.6.5 2010-01-18 21:37:12 -08:00
builtin-clean.c UI consistency: allow --force for where -f means force 2009-08-29 14:08:03 -07:00
builtin-clone.c clone: detect extra arguments 2009-10-30 15:18:11 -07:00
builtin-commit-tree.c Show usage string for 'git commit-tree -h' 2009-11-09 17:08:44 -08:00
builtin-commit.c status: don't require the repository to be writable 2010-01-19 17:10:35 -08:00
builtin-config.c Convert existing die(..., strerror(errno)) to die_errno() 2009-06-27 11:14:53 -07:00
builtin-count-objects.c Merge branch 'maint-1.6.3' into maint-1.6.4 2010-01-18 21:37:06 -08:00
builtin-describe.c describe: do not use unannotated tag even if exact match 2009-11-20 21:58:11 -08:00
builtin-diff-files.c
builtin-diff-index.c
builtin-diff-tree.c Teach --stdin option to "log" family 2009-11-20 15:10:29 -08:00
builtin-diff.c Show usage string for 'git log -h', 'git show -h' and 'git diff -h' 2009-08-07 14:40:29 -07:00
builtin-fast-export.c git fast-export: add --no-data option 2009-07-31 07:48:09 -07:00
builtin-fetch-pack.c run-command: support custom fd-set in async 2010-02-05 20:57:22 -08:00
builtin-fetch.c Merge branch 'bg/fetch-multi' 2009-11-23 00:03:15 -08:00
builtin-fmt-merge-msg.c Use die_errno() instead of die() when checking syscalls 2009-06-27 11:14:53 -07:00
builtin-for-each-ref.c Style fixes, add a space after if/for/while. 2009-08-31 23:26:28 -07:00
builtin-fsck.c Update git fsck --full short description to mention packs 2010-02-05 13:01:45 -08:00
builtin-gc.c gc --auto --quiet: make the notice a bit less verboase 2009-10-21 15:28:42 -07:00
builtin-grep.c Merge branch 'jm/maint-1.6.5-grep-NUL-terminate' into maint 2010-01-18 17:03:34 -08:00
builtin-help.c help: Do not unnecessarily look for a repository 2009-12-01 12:10:09 -08:00
builtin-init-db.c Merge branch 'ns/init-mkdir' 2009-08-05 12:39:33 -07:00
builtin-log.c Fix "log" family not to be too agressive about showing notes 2010-01-20 19:57:02 -08:00
builtin-ls-files.c Merge branch 'jk/maint-1.6.3-ls-files-i' into maint 2009-11-15 23:07:32 -08:00
builtin-ls-remote.c Require a struct remote in transport_get() 2009-11-03 21:39:28 -08:00
builtin-ls-tree.c ls-tree: migrate to parse-options 2009-11-17 21:58:12 -08:00
builtin-mailinfo.c Merge branch 'jc/mailinfo-remove-brackets' 2009-11-30 14:43:24 -08:00
builtin-mailsplit.c Show usage string for 'git mailsplit -h' 2009-11-10 11:06:57 -08:00
builtin-merge-base.c git-merge-base/git-show-branch: Cleanup documentation and usage 2009-08-05 10:28:05 -07:00
builtin-merge-file.c parse-opts: prepare for OPT_FILENAME 2009-05-25 01:07:25 -07:00
builtin-merge-ours.c Show usage string for 'git merge-ours -h' 2009-11-09 17:08:45 -08:00
builtin-merge-recursive.c merge-{recursive,subtree}: use usagef() to print usage 2009-11-10 12:00:21 -08:00
builtin-merge.c Merge branch 'mm/maint-merge-ff-error-message-fix' into maint 2009-12-08 22:42:23 -08:00
builtin-mktree.c parse-opts: prepare for OPT_FILENAME 2009-05-25 01:07:25 -07:00
builtin-mv.c Let 'git <command> -h' show usage without a git dir 2009-11-10 12:00:21 -08:00
builtin-name-rev.c parse-opts: prepare for OPT_FILENAME 2009-05-25 01:07:25 -07:00
builtin-pack-objects.c Merge branch 'maint' 2009-11-23 21:54:39 -08:00
builtin-pack-refs.c parse-opts: prepare for OPT_FILENAME 2009-05-25 01:07:25 -07:00
builtin-prune-packed.c prune-packed: only show progress when stderr is a tty 2009-11-23 21:29:45 -08:00
builtin-prune.c environment: add global variable to disable replacement 2009-05-31 17:02:59 -07:00
builtin-push.c Merge branch 'jk/maint-push-config' into maint 2009-11-15 23:07:17 -08:00
builtin-read-tree.c Let 'git <command> -h' show usage without a git dir 2009-11-10 12:00:21 -08:00
builtin-receive-pack.c receive-pack: Wrap status reports inside side-band-64k 2010-02-05 20:57:26 -08:00
builtin-reflog.c Let 'git <command> -h' show usage without a git dir 2009-11-10 12:00:21 -08:00
builtin-remote.c Merge branch 'bg/maint-remote-update-default' into maint 2010-01-20 13:23:59 -08:00
builtin-replace.c builtin-replace: use "usage_msg_opt" to give better error messages 2009-05-31 17:03:40 -07:00
builtin-rerere.c Sync with 1.6.5.5 2009-12-05 11:39:13 -08:00
builtin-reset.c reset: unbreak hard resets with GIT_WORK_TREE 2009-12-30 01:05:21 -08:00
builtin-rev-list.c Merge branch 'jc/log-stdin' 2009-11-23 22:30:08 -08:00
builtin-rev-parse.c Merge branch 'jn/help-everywhere' 2009-11-20 23:44:52 -08:00
builtin-revert.c Use die_errno() instead of die() when checking syscalls 2009-06-27 11:14:53 -07:00
builtin-rm.c Convert existing die(..., strerror(errno)) to die_errno() 2009-06-27 11:14:53 -07:00
builtin-send-pack.c send-pack: avoid deadlock when pack-object dies early 2011-04-25 15:13:24 -07:00
builtin-shortlog.c Merge branch 'uk/maint-shortlog-encoding' 2009-11-30 14:42:28 -08:00
builtin-show-branch.c Refactor pretty_print_commit arguments into a struct 2009-10-19 22:28:20 -07:00
builtin-show-ref.c Show usage string for 'git show-ref -h' 2009-11-09 17:08:53 -08:00
builtin-stripspace.c Show usage string for 'git stripspace -h' 2009-11-10 11:06:57 -08:00
builtin-symbolic-ref.c parse-opts: prepare for OPT_FILENAME 2009-05-25 01:07:25 -07:00
builtin-tag.c UI consistency: allow --force for where -f means force 2009-08-29 14:08:03 -07:00
builtin-tar-tree.c Show usage string for 'git get-tar-commit-id -h' 2009-11-10 11:06:57 -08:00
builtin-unpack-objects.c Merge branch 'jc/maint-unpack-objects-strict' into maint 2009-09-16 14:45:18 -07:00
builtin-update-index.c Check the format of more printf-type functions 2009-11-15 18:24:58 -08:00
builtin-update-ref.c parse-opts: prepare for OPT_FILENAME 2009-05-25 01:07:25 -07:00
builtin-update-server-info.c update-server-info: make builtin, use parseopt 2009-08-29 14:07:25 -07:00
builtin-upload-archive.c Merge branch 'np/maint-sideband-favor-status' into maint 2009-12-03 13:50:24 -08:00
builtin-verify-pack.c Merge branch 'maint' 2009-08-07 22:35:17 -07:00
builtin-verify-tag.c verify-tag: migrate to parse-options 2009-07-10 23:57:15 -07:00
builtin-write-tree.c write-tree: migrate to parse-options 2009-07-10 23:56:40 -07:00
builtin.h Retire fetch--tool helper to contrib/examples 2009-11-09 17:08:44 -08:00
bundle.c Merge branch 'jc/log-stdin' 2009-11-23 22:30:08 -08:00
bundle.h
cache-tree.c Improve on the 'invalid object' error message at commit time 2009-07-14 13:50:33 -07:00
cache-tree.h Optimize "diff-index --cached" using cache-tree 2009-05-25 11:35:29 -07:00
cache.h Merge branch 'mm/config-pathname-tilde-expand' into maint 2009-12-03 13:51:36 -08:00
check-builtins.sh
check-racy.c
check_bindir
color.c Clean up use of ANSI color sequences 2009-02-13 17:27:58 -08:00
color.h Add a notice that only certain functions can print color escape codes 2009-11-27 00:28:40 -08:00
combine-diff.c Give the hunk comment its own color 2009-11-28 10:05:44 -08:00
command-list.txt Add git-http-backend to command-list. 2009-12-26 14:12:34 -08:00
commit.c Merge branch 'maint-1.6.5' into maint 2010-01-29 23:36:13 -08:00
commit.h Fix "log" family not to be too agressive about showing notes 2010-01-20 19:57:02 -08:00
config.c Merge branch 'mm/config-pathname-tilde-expand' 2009-11-22 16:28:38 -08:00
config.mak.in configure.ac: rework/fix the NEEDS_RESOLV and NEEDS_LIBGEN tests 2009-07-22 21:56:51 -07:00
configure.ac configure: add settings for gitconfig, editor and pager 2009-11-04 11:29:46 -08:00
connect.c Merge branch 'cc/replace' 2009-11-23 22:24:01 -08:00
convert.c run-command: support custom fd-set in async 2010-02-05 20:57:22 -08:00
copy.c preserve mtime of local clone 2009-09-13 01:32:26 -07:00
COPYING
csum-file.c Convert existing die(..., strerror(errno)) to die_errno() 2009-06-27 11:14:53 -07:00
csum-file.h
ctype.c ctype.c: fix typo in comment 2009-05-01 16:07:29 -07:00
daemon.c Merge branch 'tc/format-attribute' 2009-11-22 16:28:14 -08:00
date.c Fix '--relative-date' 2009-10-03 06:04:38 -04:00
decorate.c Unify signedness in hashing calls 2009-05-20 00:02:24 -07:00
decorate.h
delta.h Fix big left-shifts of unsigned char 2009-06-18 09:22:46 -07:00
diff-delta.c Nicolas Pitre has a new email address 2009-09-14 02:23:36 -07:00
diff-lib.c diff-lib.c: fix misleading comments on oneway_diff() 2009-10-11 16:40:43 -07:00
diff-no-index.c diff --no-index: make the usage string less scary 2009-11-10 12:00:21 -08:00
diff.c Merge branch 'maint-1.6.4' into maint-1.6.5 2010-01-18 21:37:12 -08:00
diff.h Give the hunk comment its own color 2009-11-28 10:05:44 -08:00
diffcore-break.c diffcore-break: save cnt_data for other phases 2009-11-16 13:21:12 -08:00
diffcore-delta.c Fix diff -B/--dirstat miscounting of newly added contents 2009-12-05 10:54:17 -08:00
diffcore-order.c
diffcore-pickaxe.c pickaxe: count regex matches only once 2009-03-21 23:18:53 -07:00
diffcore-rename.c diffcore-rename: reduce memory footprint by freeing blob data early 2009-11-20 22:13:47 -08:00
diffcore.h
dir.c clean: require double -f options to nuke nested git repository and work tree 2009-07-29 12:22:30 -07:00
dir.h clean: require double -f options to nuke nested git repository and work tree 2009-07-29 12:22:30 -07:00
editor.c Provide a build time default-editor setting 2009-11-13 12:20:54 -08:00
entry.c check_path(): allow symlinked directories to checkout-index --prefix 2009-08-18 03:32:45 -07:00
environment.c Merge branch 'cc/replace' 2009-11-23 22:24:01 -08:00
exec_cmd.c Merge branch 'js/maint-1.6.0-exec-path-env' into maint-1.6.1 2009-04-08 23:01:10 -07:00
exec_cmd.h Refactor git_set_argv0_path() to git_extract_argv0_path() 2009-01-26 00:26:05 -08:00
fast-import.c Merge branch 'dp/maint-1.6.5-fast-import-non-commit-tag' into maint 2010-01-18 18:15:12 -08:00
fetch-pack.h Smart fetch over HTTP: client side 2009-11-04 17:58:15 -08:00
fixup-builtins
fsck.c Allow the Unix epoch to be a valid commit date 2009-07-06 09:36:16 -07:00
fsck.h Check the format of more printf-type functions 2009-11-15 18:24:58 -08:00
generate-cmdlist.sh
git-add--interactive.perl Merge branch 'maint' 2009-12-08 22:47:09 -08:00
git-am.sh Merge branch 'jc/maint-am-keep' into maint 2009-12-03 13:54:03 -08:00
git-archimport.perl
git-bisect.sh Merge branch 'rs/work-around-grep-opt-insanity' 2009-11-25 11:45:07 -08:00
git-compat-util.h Introduce usagef() that takes a printf-style format 2009-11-10 12:00:21 -08:00
git-cvsexportcommit.perl Avoid generating a warning if $fullname{$file} is undefined 2009-07-06 09:36:43 -07:00
git-cvsimport.perl cvsimport: fix relative argument filenames 2009-10-19 00:31:02 -07:00
git-cvsserver.perl git-cvsserver: no longer use deprecated 'git-subcommand' commands 2009-09-02 18:41:42 -07:00
git-difftool--helper.sh mergetool--lib: simplify API usage by removing more global variables 2009-04-12 15:19:12 -07:00
git-difftool.perl Explain seemingly pointless use of system in difftool 2009-04-24 01:20:35 -07:00
git-filter-branch.sh Merge branch 'rs/work-around-grep-opt-insanity' 2009-11-25 11:45:07 -08:00
git-instaweb.sh Merge branch 'rs/work-around-grep-opt-insanity' into maint 2009-12-03 13:53:58 -08:00
git-lost-found.sh
git-merge-octopus.sh octopus: remove dead code 2009-12-13 23:40:24 -08:00
git-merge-one-file.sh Show usage string for 'git merge-one-file -h' 2009-11-10 11:06:57 -08:00
git-merge-resolve.sh Convert to use quiet option when available 2009-04-22 19:05:37 -07:00
git-mergetool--lib.sh Merge branch 'rs/work-around-grep-opt-insanity' 2009-11-25 11:45:07 -08:00
git-mergetool.sh mergetool--lib: simplify API usage by removing more global variables 2009-04-12 15:19:12 -07:00
git-notes.sh Teach "-m <msg>" and "-F <file>" to "git notes edit" 2009-10-19 18:59:43 -07:00
git-parse-remote.sh parse-remote: remove unused functions 2009-06-11 19:50:45 -07:00
git-pull.sh Merge branch 'maint' 2009-12-08 22:47:09 -08:00
git-quiltimport.sh git-quiltimport: preserve standard input to be able to read user input 2009-02-25 00:49:13 -08:00
git-rebase--interactive.sh rebase--interactive: Ignore comments and blank lines in peek_next_command 2010-01-11 20:31:48 -08:00
git-rebase.sh Merge branch 'rs/work-around-grep-opt-insanity' 2009-11-25 11:45:07 -08:00
git-relink.perl
git-repack.sh Merge branch 'js/maint-graft-unhide-true-parents' 2009-07-25 00:45:03 -07:00
git-request-pull.sh request-pull: optionally show a patch as well 2009-07-29 11:02:49 -07:00
git-send-email.perl Merge branch 'fc/send-email-envelope' 2009-11-30 14:42:50 -08:00
git-sh-setup.sh Merge branch 'rs/work-around-grep-opt-insanity' 2009-11-25 11:45:07 -08:00
git-stash.sh stash: mention --patch in usage string. 2010-01-02 10:40:55 -08:00
git-submodule.sh Merge branch 'rs/work-around-grep-opt-insanity' 2009-11-25 11:45:07 -08:00
git-svn.perl git svn: branch/tag commands detect username in URLs 2009-12-23 11:58:05 -08:00
GIT-VERSION-GEN Git 1.6.6.1 2010-01-20 13:29:21 -08:00
git-web--browse.sh web--browse: fix Mac OS X GUI detection for 10.6 2009-09-14 02:27:25 -07:00
git.c Merge branch 'cc/replace' 2009-11-23 22:24:01 -08:00
git.spec.in Nicolas Pitre has a new email address 2009-09-14 02:23:36 -07:00
graph.c Merge branch 'as/maint-graph-interesting-fix' 2009-08-27 16:59:56 -07:00
graph.h Documentation: undocument gc'd function graph_release() 2009-11-19 23:05:17 -08:00
grep.c grep: Allow case insensitive search of fixed-strings 2009-11-16 16:06:46 -08:00
grep.h grep: Allow case insensitive search of fixed-strings 2009-11-16 16:06:46 -08:00
hash-object.c Use die_errno() instead of die() when checking syscalls 2009-06-27 11:14:53 -07:00
hash.c
hash.h
help.c help.autocorrect: do not run a command if the command given is junk 2009-12-15 16:21:51 -08:00
help.h
http-backend.c http-backend: Let gcc check the format of more printf-type functions. 2009-11-15 22:15:01 -08:00
http-fetch.c Let 'git http-fetch -h' show usage outside any git repository 2009-11-10 11:11:21 -08:00
http-push.c Disable CURLOPT_NOBODY before enabling CURLOPT_PUT and CURLOPT_POST 2009-11-22 22:56:54 -08:00
http-walker.c Merge branch 'rc/maint-http-local-slot-fix' into maint 2009-06-21 21:15:31 -07:00
http.c Smart push over HTTP: client side 2009-11-04 17:58:15 -08:00
http.h Smart push over HTTP: client side 2009-11-04 17:58:15 -08:00
ident.c Suppress warnings from "git var -l" 2009-11-13 12:16:30 -08:00
imap-send.c Merge branch 'tc/format-attribute' 2009-11-22 16:28:14 -08:00
index-pack.c Let 'git <command> -h' show usage without a git dir 2009-11-10 12:00:21 -08:00
INSTALL INSTALL: Describe dependency knobs from Makefile 2009-09-10 21:34:43 -07:00
levenshtein.c Fix typos / spelling in comments 2009-04-22 19:02:12 -07:00
levenshtein.h
list-objects.c Merge branch 'lt/pack-object-memuse' 2009-04-18 14:46:17 -07:00
list-objects.h Merge branch 'lt/pack-object-memuse' 2009-04-18 14:46:17 -07:00
ll-merge.c Merge branch 'js/run-command-updates' 2009-08-10 22:14:57 -07:00
ll-merge.h
lockfile.c git branch -D: give a better error message when lockfile creation fails 2009-09-29 08:14:47 -07:00
log-tree.c Fix "log" family not to be too agressive about showing notes 2010-01-20 19:57:02 -08:00
log-tree.h git-log: allow --decorate[=short|full] 2009-08-26 12:05:58 -07:00
mailmap.c Fix various sparse warnings in the git source code 2009-06-20 21:52:55 -07:00
mailmap.h Add map_user() and clear_mailmap() to mailmap 2009-02-08 12:36:38 -08:00
Makefile git-gui: Makefile: consolidate .FORCE-* targets 2010-01-06 18:20:01 -08:00
match-trees.c
merge-file.c
merge-index.c Simplify some instances of run_command() by using run_command_v_opt(). 2009-06-09 00:15:57 -07:00
merge-recursive.c merge-recursive: do not return NULL only to cause segfault 2010-01-21 17:02:30 -08:00
merge-recursive.h merge-recursive: make the error-message generation an extern function 2009-11-29 23:52:31 -08:00
merge-tree.c Replace deprecated dashed git commands in usage 2009-02-04 15:08:49 -08:00
mktag.c Merge branch 'cc/replace' 2009-08-21 18:47:53 -07:00
name-hash.c
notes.c Fix crasher on encountering SHA1-like non-note in notes tree 2009-12-03 10:10:35 -08:00
notes.h Teach notes code to free its internal data structures on request 2009-10-19 19:00:24 -07:00
object.c object: call "check_sha1_signature" with the replacement sha1 2009-05-31 17:02:59 -07:00
object.h Merge branch 'js/maint-all-implies-HEAD' into maint 2009-02-05 17:54:12 -08:00
pack-check.c Don't expect verify_pack() callers to set pack_size 2009-06-06 10:56:27 -07:00
pack-redundant.c Let 'git <command> -h' show usage without a git dir 2009-11-10 12:00:21 -08:00
pack-refs.c Convert existing die(..., strerror(errno)) to die_errno() 2009-06-27 11:14:53 -07:00
pack-refs.h
pack-revindex.c janitor: useless checks before free 2009-07-22 21:57:41 -07:00
pack-revindex.h
pack-write.c Convert existing die(..., strerror(errno)) to die_errno() 2009-06-27 11:14:53 -07:00
pack.h
pager.c Provide a build time default-pager setting 2009-11-13 12:20:56 -08:00
parse-options.c parse-opt: ignore negation of OPT_NONEG for ambiguity checks 2009-09-29 07:28:47 -07:00
parse-options.h Merge branch 'cc/replace' 2009-08-21 18:47:53 -07:00
patch-delta.c Nicolas Pitre has a new email address 2009-09-14 02:23:36 -07:00
patch-id.c Replace deprecated dashed git commands in usage 2009-02-04 15:08:49 -08:00
patch-ids.c patch-ids: use the new generic "sha1_pos" function to lookup sha1 2009-04-04 22:57:42 -07:00
patch-ids.h
path.c ignore duplicated slashes in make_relative_path() 2010-01-22 15:34:56 -08:00
pkt-line.c pkt-line: Make packet_read_line easier to debug 2009-10-30 19:20:53 -07:00
pkt-line.h pkt-line: Add strbuf based functions 2009-10-30 19:20:53 -07:00
preload-index.c janitor: add DIV_ROUND_UP and use it. 2009-07-22 21:57:41 -07:00
pretty.c Fix "log" family not to be too agressive about showing notes 2010-01-20 19:57:02 -08:00
progress.c change throughput display units with fast links 2009-10-14 01:19:29 -07:00
progress.h
quote.c Fix various sparse warnings in the git source code 2009-06-20 21:52:55 -07:00
quote.h quote: add "sq_dequote_to_argv" to put unwrapped args in an argv array 2009-03-30 01:22:53 -07:00
reachable.c process_{tree,blob}: Remove useless xstrdup calls 2009-04-08 22:58:43 -07:00
reachable.h
read-cache.c Merge branch 'nf/maint-fix-index-ext-len-on-be64' into maint 2009-12-27 10:42:00 -08:00
README README: git lives at http://git-scm.com these days 2009-10-07 12:47:24 -07:00
reflog-walk.c Introduce new pretty formats %g[sdD] for reflog information 2009-10-19 22:28:26 -07:00
reflog-walk.h Introduce new pretty formats %g[sdD] for reflog information 2009-10-19 22:28:26 -07:00
refs.c teach warn_dangling_symref to take a FILE argument 2009-11-10 01:01:47 -08:00
refs.h teach warn_dangling_symref to take a FILE argument 2009-11-10 01:01:47 -08:00
RelNotes Git 1.6.5.8 2010-01-20 12:44:59 -08:00
remote-curl.c run-command: support custom fd-set in async 2010-02-05 20:57:22 -08:00
remote.c Merge branch 'bg/fetch-multi' 2009-11-23 00:03:15 -08:00
remote.h remote: refactor some logic into get_stale_heads() 2009-11-10 01:01:22 -08:00
replace_object.c environment: add global variable to disable replacement 2009-05-31 17:02:59 -07:00
rerere.c use write_str_in_full helper to avoid literal string lengths 2009-09-13 01:31:10 -07:00
rerere.h rerere: remove duplicated functions 2009-02-14 21:27:35 -08:00
revision.c Fix "log --oneline" not to show notes 2010-01-21 14:57:41 -08:00
revision.h Fix "log" family not to be too agressive about showing notes 2010-01-20 19:57:02 -08:00
run-command.c run-command: support custom fd-set in async 2010-02-05 20:57:22 -08:00
run-command.h run-command: support custom fd-set in async 2010-02-05 20:57:22 -08:00
send-pack.h Smart push over HTTP: client side 2009-11-04 17:58:15 -08:00
server-info.c Merge branch 'ar/unlink-err' into maint 2009-05-25 19:01:50 -07:00
setup.c Merge branch 'maint' to sync with 1.6.5.7 2009-12-16 12:47:15 -08:00
sha1-lookup.c sha1-lookup: fix up the assertion message 2009-04-06 00:56:27 -07:00
sha1-lookup.h sha1-lookup: add new "sha1_pos" function to efficiently lookup sha1 2009-04-04 22:57:39 -07:00
sha1_file.c Fix incorrect error check while reading deflated pack data 2009-10-21 23:19:47 -07:00
sha1_name.c sha1_name.c: avoid unnecessary strbuf_release 2009-07-16 15:09:21 -07:00
shallow.c
shell.c Convert existing die(..., strerror(errno)) to die_errno() 2009-06-27 11:14:53 -07:00
shortlog.h
show-index.c Show usage string for 'git show-index -h' 2009-11-10 11:06:57 -08:00
sideband.c Smart push over HTTP: client side 2009-11-04 17:58:15 -08:00
sideband.h recv_sideband: Bands #2 and #3 always go to stderr 2009-03-10 23:23:02 -07:00
sigchain.c refactor signal handling for cleanup functions 2009-01-21 22:46:53 -08:00
sigchain.h refactor signal handling for cleanup functions 2009-01-21 22:46:53 -08:00
strbuf.c strbuf: add new function strbuf_getwholeline() 2009-08-05 12:13:56 -07:00
strbuf.h Check the format of more printf-type functions 2009-11-15 18:24:58 -08:00
string-list.c string-list: new for_each_string_list() function 2009-02-27 15:19:08 -08:00
string-list.h string-list: new for_each_string_list() function 2009-02-27 15:19:08 -08:00
submodule.c submodule.c: Squelch a "use before assignment" warning 2009-11-20 21:58:11 -08:00
submodule.h Add the --submodule option to the diff option family 2009-10-19 22:31:00 -07:00
symlinks.c lstat_cache: guard against full match of length of 'name' parameter 2009-07-29 20:20:12 -07:00
tag.c
tag.h
tar.h
test-chmtime.c test-chmtime: work around Windows limitation 2009-06-01 00:10:08 -07:00
test-ctype.c
test-date.c refactor test-date interface 2009-08-30 22:04:46 -07:00
test-delta.c Nicolas Pitre has a new email address 2009-09-14 02:23:36 -07:00
test-dump-cache-tree.c add test-dump-cache-tree in Makefile 2009-02-03 22:11:44 -08:00
test-genrandom.c test-genrandom: ensure stdout is set to _O_BINARY on Windows 2009-09-21 00:36:12 -07:00
test-match-trees.c
test-parse-options.c parse-opt: ignore negation of OPT_NONEG for ambiguity checks 2009-09-29 07:28:47 -07:00
test-path-utils.c Introduce the function strip_path_suffix() 2009-02-19 22:45:48 -08:00
test-sha1.c Convert existing die(..., strerror(errno)) to die_errno() 2009-06-27 11:14:53 -07:00
test-sha1.sh
test-sigchain.c t0005: use SIGTERM for sigchain test 2009-01-30 01:14:26 -08:00
thread-utils.c Make usage of windows.h lean and mean 2009-09-18 20:00:42 -07:00
thread-utils.h
trace.c trace: Fixed a minor typo in an error message. 2009-02-25 00:49:53 -08:00
transport-helper.c remote-helpers: return successfully if everything up-to-date 2009-10-30 19:20:54 -07:00
transport.c Fix uninitialized variable in get_refs_via_rsync(). 2010-01-15 21:20:28 -08:00
transport.h fetch: Allow transport -v -v -v to set verbosity to 3 2009-10-30 19:20:54 -07:00
tree-diff.c Merge branch 'ne/maint-1.6.0-diff-tree-t-r-show-directory' 2009-07-01 19:40:47 -07:00
tree-walk.c
tree-walk.h
tree.c Fix off-by-one in read_tree_recursive 2009-04-20 13:44:14 -07:00
tree.h
unimplemented.sh Makefile: allow building without perl 2009-04-08 22:14:56 -07:00
unpack-file.c Show usage string for 'git unpack-file -h' 2009-11-10 11:06:57 -08:00
unpack-trees.c Merge branch 'jc/fix-tree-walk' (early part) 2009-11-20 23:55:50 -08:00
unpack-trees.h read-tree: migrate to parse-options 2009-06-27 14:11:28 -07:00
upload-pack.c run-command: support custom fd-set in async 2010-02-05 20:57:22 -08:00
usage.c Fix truncated usage messages 2009-11-22 16:14:48 -08:00
userdiff.c avoid exponential regex match for java and objc function names 2009-06-18 09:52:10 -07:00
userdiff.h
utf8.c strbuf_add_wrapped_text(): skip over colour codes 2009-11-23 15:36:07 -08:00
utf8.h Add strbuf_add_wrapped_text() to utf8.[ch] 2009-10-19 00:57:29 -07:00
var.c Teach git var about GIT_PAGER 2009-11-13 12:20:47 -08:00
walker.c janitor: useless checks before free 2009-07-22 21:57:41 -07:00
walker.h
wrapper.c Convert existing die(..., strerror(errno)) to die_errno() 2009-06-27 11:14:53 -07:00
write_or_die.c Convert existing die(..., strerror(errno)) to die_errno() 2009-06-27 11:14:53 -07:00
ws.c Merge branch 'jc/maint-1.6.0-blank-at-eof' (early part) into jc/maint-blank-at-eof 2009-09-15 03:28:08 -07:00
wt-status.c status: make "how to stage" messages optional 2009-09-11 21:33:24 -07:00
wt-status.h wt-status: collect untracked files in a separate "collect" phase 2009-08-10 12:56:43 -07:00
xdiff-interface.c userdiff: add xdiff_clear_find_func() 2009-07-01 19:16:37 -07:00
xdiff-interface.h userdiff: add xdiff_clear_find_func() 2009-07-01 19:16:37 -07:00

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

	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.
It was originally written by Linus Torvalds with help of a group of
hackers around the net. It is currently maintained by Junio C Hamano.

Please read the file INSTALL for installation instructions.

See Documentation/gittutorial.txt to get started, then see
Documentation/everyday.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. 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://marc.theaimsgroup.com/?l=git and other archival sites.

The messages titled "A note from the maintainer", "What's in
git.git (stable)" and "What's cooking in git.git (topics)" and
the discussion following them on the mailing list give a good
reference for project status, development direction and
remaining tasks.