mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-10 04:56:07 +02:00
Code
Git Source Code Mirror. Please follow Documentation/SubmittingPatches procedure for any of your improvements.
48,500 Commits 6 Branches 933 Tags 279 MiB
C 49.9%
Shell 38.8%
Perl 5.3%
Tcl 3.4%
Python 0.8%
Other 1.6%
Go to file
Jeff King 076aa2cbda tempfile: auto-allocate tempfiles on heap 
The previous commit taught the tempfile code to give up
ownership over tempfiles that have been renamed or deleted.
That makes it possible to use a stack variable like this:

  struct tempfile t;

  create_tempfile(&t, ...);
  ...
  if (!err)
          rename_tempfile(&t, ...);
  else
          delete_tempfile(&t);

But doing it this way has a high potential for creating
memory errors. The tempfile we pass to create_tempfile()
ends up on a global linked list, and it's not safe for it to
go out of scope until we've called one of those two
deactivation functions.

Imagine that we add an early return from the function that
forgets to call delete_tempfile(). With a static or heap
tempfile variable, the worst case is that the tempfile hangs
around until the program exits (and some functions like
setup_shallow_temporary rely on this intentionally, creating
a tempfile and then leaving it for later cleanup).

But with a stack variable as above, this is a serious memory
error: the variable goes out of scope and may be filled with
garbage by the time the tempfile code looks at it.  Let's
see if we can make it harder to get this wrong.

Since many callers need to allocate arbitrary numbers of
tempfiles, we can't rely on static storage as a general
solution. So we need to turn to the heap. We could just ask
all callers to pass us a heap variable, but that puts the
burden on them to call free() at the right time.

Instead, let's have the tempfile code handle the heap
allocation _and_ the deallocation (when the tempfile is
deactivated and removed from the list).

This changes the return value of all of the creation
functions. For the cleanup functions (delete and rename),
we'll add one extra bit of safety: instead of taking a
tempfile pointer, we'll take a pointer-to-pointer and set it
to NULL after freeing the object. This makes it safe to
double-call functions like delete_tempfile(), as the second
call treats the NULL input as a noop. Several callsites
follow this pattern.

The resulting patch does have a fair bit of noise, as each
caller needs to be converted to handle:

  1. Storing a pointer instead of the struct itself.

  2. Passing the pointer instead of taking the struct
     address.

  3. Handling a "struct tempfile *" return instead of a file
     descriptor.

We could play games to make this less noisy. For example, by
defining the tempfile like this:

  struct tempfile {
	struct heap_allocated_part_of_tempfile {
                int fd;
                ...etc
        } *actual_data;
  }

Callers would continue to have a "struct tempfile", and it
would be "active" only when the inner pointer was non-NULL.
But that just makes things more awkward in the long run.
There aren't that many callers, so we can simply bite
the bullet and adjust all of them. And the compiler makes it
easy for us to find them all.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 		2017-09-06 17:19:54 +09:00
.github Configure Git contribution guidelines for github.com 2017-06-13 08:41:47 -07:00
Documentation The sixth batch post 2.14 2017-09-06 13:15:24 +09:00
block-sha1
…
builtin tempfile: auto-allocate tempfiles on heap 2017-09-06 17:19:54 +09:00
ci Merge branch 'ls/travis-doc-asciidoctor' into maint 2017-06-05 09:03:10 +09:00
compat Merge branch 'rs/bswap-ubsan-fix' into maint 2017-08-23 14:33:46 -07:00
contrib Merge branch 'eb/contacts-reported-by' 2017-08-11 13:27:06 -07:00
ewah use DIV_ROUND_UP 2017-07-10 14:24:36 -07:00
git-gui Merge branch 'js/msgfmt-on-windows' of ../git-gui into js/git-gui-msgfmt-on-windows 2017-07-25 13:42:41 -07:00
gitk-git Merge git://ozlabs.org/~paulus/gitk 2017-01-18 10:27:59 -08:00
gitweb Merge branch 'js/gitweb-raw-blob-link-in-history' 2017-08-26 22:55:07 -07:00
mergetools mergetools/meld: improve compatibiilty with Meld on macOS X 2017-06-18 22:11:29 -07:00
outgoing pack: move pack name-related functions 2017-08-23 15:12:06 -07:00
perl Merge branch 'ur/svn-local-zone' 2017-08-22 10:29:07 -07:00
po l10n: zh_CN: review for git v2.14.0 l10n 2017-08-02 08:02:37 +08:00
ppc
…
refs tempfile: auto-allocate tempfiles on heap 2017-09-06 17:19:54 +09: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 Merge branch 'rs/archive-excluded-directory' 2017-09-06 13:11:25 +09:00
templates Merge branch 'ks/prepare-commit-msg-sample-fix' 2017-08-23 14:13:07 -07:00
vcs-svn Merge branch 'jn/vcs-svn-cleanup' 2017-08-26 22:55:06 -07:00
xdiff xdiff -W: relax end-of-file function detection 2017-01-15 16:08:11 -08:00
.gitattributes Fix build with core.autocrlf=true 2017-05-10 13:32:50 +09:00
.gitignore rebase--helper: add a builtin helper for interactive rebases 2017-02-09 14:55:26 -08:00
.gitmodules sha1dc: optionally use sha1collisiondetection as a submodule 2017-07-03 10:09:34 -07:00
.mailmap Git 2.12.2 2017-03-24 13:31:01 -07:00
.travis.yml Merge branch 'ls/travis-doc-asciidoctor' into maint 2017-06-05 09:03:10 +09:00
COPYING
…
GIT-VERSION-GEN Prepare for 2.14.2 2017-08-23 14:36:03 -07:00
INSTALL
…
LGPL-2.1
…
Makefile Merge branch 'jt/packmigrate' 2017-08-26 22:55:09 -07:00
README.md README: create HTTP/HTTPS links from URLs in Markdown 2017-03-01 14:45:45 -08:00
RelNotes Prepare for 2.14.2 2017-08-23 14:36:03 -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 add: warn when adding an embedded repository 2017-06-15 09:10:44 -07:00
alias.c Merge branch 'js/alias-case-sensitivity' 2017-07-20 16:29:59 -07:00
alloc.c
…
apply.c Merge branch 'tb/apply-with-crlf' 2017-08-26 22:55:05 -07:00
apply.h apply: remove prefix_length member from apply_state 2017-08-09 10:21:45 -07:00
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 Merge branch 'rs/archive-excluded-directory' 2017-09-06 13:11:25 +09:00
archive.h timestamp_t: a new data type for timestamps 2017-04-27 13:07:39 +09:00
argv-array.c argv-array: add detach function 2016-02-22 14:50:32 -08:00
argv-array.h argv-array: add detach function 2016-02-22 14:50:32 -08:00
attr.c attr.c: drop hashmap_cmp_fn cast 2017-07-05 13:53:12 -07:00
attr.h pathspec: allow querying for attributes 2017-03-13 15:28:54 -07:00
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 'js/blame-lib' 2017-07-31 13:05:15 -07:00
blame.h blame: move entry prepend to libgit 2017-05-25 13:08:23 +09:00
blob.c Convert lookup_blob to struct object_id 2017-05-08 15:12:57 +09:00
blob.h Convert lookup_blob to struct object_id 2017-05-08 15:12:57 +09:00
branch.c branch: quote branch/ref names to improve readability 2017-08-17 13:33:28 -07:00
branch.h branch: record creation of renamed branch in HEAD's log 2017-02-20 22:04:47 -08:00
builtin.h git.c: provide setup_auto_pager() 2017-08-03 11:08:10 -07:00
bulk-checkin.c pack: move {,re}prepare_packed_git and approximate_object_count 2017-08-23 15:12:07 -07:00
bulk-checkin.h
…
bundle.c Merge branch 'bc/object-id' 2017-05-29 12:34:43 +09:00
bundle.h bundle: convert to struct object_id 2017-05-02 10:46:41 +09:00
cache-tree.c write_index_as_tree: cleanup tempfile on error 2017-09-06 17:19:52 +09:00
cache-tree.h Convert struct cache_tree to use struct object_id 2017-05-02 10:46:41 +09:00
cache.h Merge branch 'jt/packmigrate' 2017-08-26 22:55:09 -07:00
check-builtins.sh
…
check-racy.c check-racy.c: use error_errno() 2016-05-09 12:29:08 -07:00
check_bindir
…
color.c color: check color.ui in git_default_config() 2017-07-13 12:42:51 -07:00
color.h diff.c: add dimming to moved line detection 2017-06-30 13:59:42 -07:00
column.c config: don't include config.h by default 2017-06-15 12:56:22 -07:00
column.h
…
combine-diff.c Merge branch 'bw/ls-files-sans-the-index' 2017-06-24 14:28:40 -07:00
command-list.txt relink: retire the command 2017-01-25 14:42:37 -08:00
commit-slab.h *.[ch] refactoring: make use of the FREE_AND_NULL() macro 2017-06-16 12:44:09 -07:00
commit.c commit: rewrite read_graft_line 2017-08-18 12:41:06 -07:00
commit.h Merge branch 'po/read-graft-line' 2017-09-06 13:11:25 +09:00
common-main.c attr: use hashmap for attribute dictionary 2017-02-01 13:46:53 -08:00
config.c Merge branch 'jc/cutoff-config' 2017-08-26 22:55:08 -07:00
config.h Merge branch 'jc/cutoff-config' 2017-08-26 22:55:08 -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 Git 2.13.5 2017-08-04 12:40:37 -07:00
connect.h connect & http: support -4 and -6 switches for remote operations 2016-02-12 11:34:14 -08:00
connected.c pack: move {,re}prepare_packed_git and approximate_object_count 2017-08-23 15:12:07 -07:00
connected.h check_connected: accept an env argument 2016-10-10 13:54:02 -07:00
convert.c Merge branch 'tb/apply-with-crlf' 2017-08-26 22:55:05 -07:00
convert.h Merge branch 'tb/apply-with-crlf' 2017-08-26 22:55:05 -07:00
copy.c copy.c: use error_errno() 2016-05-09 12:29:08 -07:00
credential-cache--daemon.c tempfile: auto-allocate tempfiles on heap 2017-09-06 17:19:54 +09:00
credential-cache.c Merge branch 'dl/credential-cache-socket-in-xdg-cache' into maint 2017-08-23 14:33:45 -07:00
credential-store.c path.c: and an option to call real_path() in expand_user_path() 2017-04-14 23:51:38 -07:00
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 config: don't include config.h by default 2017-06-15 12:56:22 -07:00
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: convert fill_filespec to struct object_id 2017-06-02 09:36:07 +09:00
diff.c tempfile: auto-allocate tempfiles on heap 2017-09-06 17:19:54 +09:00
diff.h diff: define block by number of alphanumeric chars 2017-08-16 11:44:00 -07:00
diffcore-break.c Merge branch 'tk/diffcore-delta-remove-unused' into maint 2016-11-29 13:28:03 -08:00
diffcore-delta.c Merge branch 'tk/diffcore-delta-remove-unused' 2016-11-17 13:45:22 -08:00
diffcore-order.c wildmatch: remove unused wildopts parameter 2017-06-23 18:27:07 -07:00
diffcore-pickaxe.c Merge branch 'js/regexec-buf' into maint 2017-03-28 13:52:24 -07:00
diffcore-rename.c progress: simplify "delayed" progress API 2017-08-19 14:01:34 -07:00
diffcore.h diff: convert fill_filespec to struct object_id 2017-06-02 09:36:07 +09:00
dir-iterator.c dir_iterator: new API for iterating over a directory tree 2016-06-20 11:38:21 -07:00
dir-iterator.h dir_iterator: new API for iterating over a directory tree 2016-06-20 11:38:21 -07:00
dir.c Merge branch 'rs/stat-data-unaligned-reads-fix' into maint 2017-08-23 14:33:48 -07:00
dir.h Merge branch 'pc/dir-count-slashes' 2017-06-22 14:15:21 -07:00
editor.c editor.c: use error_errno() 2016-05-09 12:29:08 -07:00
entry.c convert: add "status=delayed" to filter process protocol 2017-06-30 13:50:41 -07:00
environment.c Merge branch 'bw/config-h' 2017-06-24 14:28:41 -07:00
exec_cmd.c Merge branch 'js/exec-path-coverity-workaround' into maint 2017-01-31 13:32:10 -08:00
exec_cmd.h common-main: stop munging argv[0] path 2016-11-29 11:01:48 -08:00
fast-import.c pack: move pack name-related functions 2017-08-23 15:12:06 -07:00
fetch-pack.c pack: move {,re}prepare_packed_git and approximate_object_count 2017-08-23 15:12:07 -07:00
fetch-pack.h Rename sha1_array to oid_array 2017-03-31 08:33:56 -07:00
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 Rename sha1_array to oid_array 2017-03-31 08:33:56 -07:00
generate-cmdlist.sh
…
gettext.c gettext: add is_utf8_locale() 2016-07-01 12:44:57 -07:00
gettext.h gettext: add is_utf8_locale() 2016-07-01 12:44:57 -07:00
git-add--interactive.perl Merge branch 'pw/unquote-path-in-git-pm' into maint 2017-07-31 13:51:05 -07:00
git-archimport.perl
…
git-bisect.sh i18n: unmark die messages for translation 2016-06-17 15:46:10 -07:00
git-compat-util.h pack: move release_pack_memory() 2017-08-23 15:12:06 -07:00
git-cvsexportcommit.perl
…
git-cvsimport.perl
…
git-cvsserver.perl typofix: assorted typofixes in comments, documentation and messages 2016-05-06 13:16:37 -07:00
git-difftool--helper.sh difftool: always honor fatal error exit codes 2016-08-15 15:24:05 -07:00
git-filter-branch.sh filter-branch: add [--] to usage 2017-06-12 09:49:52 -07:00
git-instaweb.sh
…
git-merge-octopus.sh scripts: use "git foo" not "git-foo" 2017-08-07 12:04:45 -07:00
git-merge-one-file.sh scripts: use "git foo" not "git-foo" 2017-08-07 12:04:45 -07:00
git-merge-resolve.sh scripts: use "git foo" not "git-foo" 2017-08-07 12:04:45 -07:00
git-mergetool--lib.sh mergetool: honor mergetool.$tool.trustExitCode for built-in tools 2016-11-29 10:54:03 -08:00
git-mergetool.sh mergetool: fix running in subdir when rerere enabled 2017-01-10 13:22:51 -08:00
git-p4.py git-p4: filter for {'code':'info'} in p4CmdList 2017-07-13 10:52:42 -07:00
git-parse-remote.sh i18n: git-parse-remote.sh: mark strings for translation 2016-04-19 12:07:49 -07:00
git-quiltimport.sh
…
git-rebase--am.sh Merge branch 'kw/rebase-progress' 2017-08-23 14:13:07 -07:00
git-rebase--interactive.sh rebase -i: honor --rerere-autoupdate 2017-08-02 15:16:09 -07:00
git-rebase--merge.sh Merge branch 'em/newer-freebsd-shells-are-fine-with-returns' into maint 2016-07-06 13:06:41 -07:00
git-rebase.sh Merge branch 'kw/rebase-progress' 2017-08-23 14:13:07 -07:00
git-remote-testgit.sh
…
git-request-pull.sh request-pull: drop old USAGE stuff 2017-01-15 16:23:23 -08:00
git-send-email.perl Merge branch 'xz/send-email-batch-size' 2017-07-06 18:14:46 -07:00
git-sh-i18n.sh i18n: rebase-interactive: mark here-doc strings for translation 2016-06-17 15:45:48 -07:00
git-sh-setup.sh Merge branch 'va/i18n-even-more' 2016-12-27 00:11:45 -08:00
git-stash.sh Merge branch 'kd/stash-with-bash-4.4' 2017-08-23 14:13:08 -07:00
git-submodule.sh Merge branch 'sb/submodule-parallel-update' 2017-08-23 14:13:14 -07:00
git-svn.perl git svn: fix authentication with 'branch' 2017-03-07 21:29:03 +00:00
git-web--browse.sh
…
git.c Merge branch 'bw/grep-recurse-submodules' 2017-08-22 10:29:01 -07:00
git.rc
…
gpg-interface.c tempfile: auto-allocate tempfiles on heap 2017-09-06 17:19:54 +09:00
gpg-interface.h gpg-interface, tag: add GPG_VERIFY_OMIT_STATUS flag 2017-01-17 16:10:22 -08:00
graph.c config: don't include config.h by default 2017-06-15 12:56:22 -07:00
graph.h graph: add support for --line-prefix on all graph-aware output 2016-08-31 18:07:09 -07:00
grep.c Merge branch 'as/grep-quiet-no-match-exit-code-fix' 2017-08-23 14:13:12 -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 Convert GIT_SHA1_HEXSZ used for allocation to GIT_MAX_HEXSZ 2017-03-26 22:08:21 -07:00
http-backend.c pack: move {,re}prepare_packed_git and approximate_object_count 2017-08-23 15:12:07 -07:00
http-fetch.c config: don't include config.h by default 2017-06-15 12:56:22 -07:00
http-push.c pack: move find_sha1_pack() 2017-08-23 15:12:07 -07:00
http-walker.c pack: move find_sha1_pack() 2017-08-23 15:12:07 -07:00
http.c Merge branch 'jt/packmigrate' 2017-08-26 22:55:09 -07:00
http.h http.postbuffer: allow full range of ssize_t values 2017-04-13 18:24:32 -07:00
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 refs: introduce an iterator interface 2016-06-20 11:38:20 -07:00
khash.h convert trivial cases to ALLOC_ARRAY 2016-02-22 14:51:09 -08:00
kwset.c
…
kwset.h
…
levenshtein.c convert trivial cases to ALLOC_ARRAY 2016-02-22 14:51:09 -08:00
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 use SWAP macro 2017-01-30 14:17:00 -08:00
line-range.h
…
list-objects.c Convert lookup_tree to struct object_id 2017-05-08 15:12:57 +09:00
list-objects.h list-objects: pass full pathname to callbacks 2016-03-16 10:41:04 -07:00
list.h tempfile: use list.h for linked list 2017-09-06 17:19:54 +09:00
ll-merge.c Merge branch 'ab/free-and-null' 2017-06-24 14:28:41 -07:00
ll-merge.h
…
lockfile.c tempfile: auto-allocate tempfiles on heap 2017-09-06 17:19:54 +09:00
lockfile.h tempfile: auto-allocate tempfiles on heap 2017-09-06 17:19:54 +09:00
log-tree.c Merge branch 'bw/config-h' 2017-06-24 14:28:41 -07:00
log-tree.h pretty: use fmt_output_email_subject() 2017-03-01 15:09:17 -08:00
mailinfo.c Spelling fixes 2017-06-27 10:35:49 -07:00
mailinfo.h mailinfo: handle in-body header continuations 2016-09-21 10:23:11 -07:00
mailmap.c Convert remaining callers of get_sha1 to get_oid. 2017-07-17 13:54:51 -07:00
mailmap.h
…
match-trees.c match-trees: convert several leaf functions to use struct object_id 2016-04-25 14:26:29 -07:00
merge-blobs.c Merge branch 'jk/no-diff-emit-common' into maint 2016-03-10 11:13:42 -08:00
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-recursive: offer an option to retain the output in 'obuf' 2016-08-01 11:45:30 -07:00
merge.c tree: convert parse_tree_indirect to struct object_id 2017-05-08 15:12:58 +09:00
mergesort.c
…
mergesort.h
…
mru.c add generic most-recently-used list 2016-07-29 11:05:07 -07:00
mru.h add generic most-recently-used list 2016-07-29 11:05:07 -07:00
name-hash.c name-hash.c: drop hashmap_cmp_fn cast 2017-07-05 13:53:12 -07:00
notes-cache.c notes: convert some accessor functions to struct object_id 2017-06-02 09:36:06 +09:00
notes-cache.h notes-cache: convert to struct object_id 2017-05-08 15:12:57 +09:00
notes-merge.c sha1_file: convert index_path to struct object_id 2017-08-20 21:51:38 -07:00
notes-merge.h notes-merge: convert notes_merge* to struct object_id 2017-06-05 11:23:58 +09:00
notes-utils.c Merge branch 'bw/config-h' 2017-06-24 14:28:41 -07:00
notes-utils.h builtin/notes: convert to struct object_id 2017-06-02 09:36:06 +09:00
notes.c tree-walk: convert fill_tree_descriptor() to object_id 2017-08-14 12:38:54 -07:00
notes.h notes: convert some accessor functions to struct object_id 2017-06-02 09:36:06 +09:00
object.c object: remove "used" field from struct object 2017-07-20 14:54:08 -07:00
object.h object: remove "used" field from struct object 2017-07-20 14:54:08 -07:00
oidset.c hashmap.h: compare function has access to a data field 2017-06-30 12:49:28 -07:00
oidset.h add oidset API 2017-02-08 15:39:55 -08:00
pack-bitmap-write.c pack: convert struct pack_idx_entry to struct object_id 2017-05-08 15:12:57 +09:00
pack-bitmap.c pack: move open_pack_index(), parse_pack_index() 2017-08-23 15:12:06 -07:00
pack-bitmap.h
…
pack-check.c pack: move open_pack_index(), parse_pack_index() 2017-08-23 15:12:06 -07:00
pack-objects.c pack: convert struct pack_idx_entry to struct object_id 2017-05-08 15:12:57 +09:00
pack-objects.h pack-objects: enforce --depth limit in reused deltas 2017-01-27 16:24:44 -08:00
pack-revindex.c use SWAP macro 2017-01-30 14:17:00 -08:00
pack-revindex.h
…
pack-write.c pack: convert struct pack_idx_entry to struct object_id 2017-05-08 15:12:57 +09:00
pack.h Convert the verify_pack callback to struct object_id 2017-05-08 15:12:57 +09:00
packfile.c pack: move for_each_packed_object() 2017-08-23 15:12:07 -07:00
packfile.h pack: move for_each_packed_object() 2017-08-23 15:12:07 -07:00
pager.c Merge branch 'ma/parse-maybe-bool' 2017-08-22 10:29:03 -07:00
parse-options-cb.c Merge branch 'bc/object-id' 2017-05-29 12:34:43 +09:00
parse-options.c Merge branch 'bw/config-h' 2017-06-24 14:28:41 -07:00
parse-options.h ref-filter: add --no-contains option to tag/branch/for-each-ref 2017-03-24 12:15:26 -07:00
patch-delta.c
…
patch-ids.c patch-ids.c: drop hashmap_cmp_fn cast 2017-07-05 13:53:12 -07:00
patch-ids.h patch-ids: convert to struct object_id 2017-06-02 09:36:07 +09:00
path.c pack: move {,re}prepare_packed_git and approximate_object_count 2017-08-23 15:12:07 -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 pathspec: convert find_pathspecs_matching_against_index to take an index 2017-05-12 14:23:46 +09:00
pkt-line.c sub-process: refactor handshake to common function 2017-07-26 13:00:40 -07:00
pkt-line.h sub-process: refactor handshake to common function 2017-07-26 13:00:40 -07:00
preload-index.c preload-index: avoid lstat for skip-worktree items 2017-02-10 14:44:18 -08:00
pretty.c Merge branch 'jk/trailers-parse' 2017-08-26 22:55:04 -07:00
prio-queue.c *.[ch] refactoring: make use of the FREE_AND_NULL() macro 2017-06-16 12:44:09 -07:00
prio-queue.h
…
progress.c progress: simplify "delayed" progress API 2017-08-19 14:01:34 -07:00
progress.h progress: simplify "delayed" progress API 2017-08-19 14:01:34 -07:00
prompt.c config: don't include config.h by default 2017-06-15 12:56:22 -07:00
prompt.h
…
quote.c Merge branch 'nd/icase' into maint 2016-07-28 11:26:03 -07:00
quote.h Merge branch 'nd/icase' into maint 2016-07-28 11:26:03 -07:00
reachable.c pack: move for_each_packed_object() 2017-08-23 15:12:07 -07:00
reachable.h timestamp_t: a new data type for timestamps 2017-04-27 13:07:39 +09:00
read-cache.c tempfile: auto-allocate tempfiles on heap 2017-09-06 17:19:54 +09:00
ref-filter.c ref-filter: consult want_color() before emitting colors 2017-07-13 12:42:51 -07:00
ref-filter.h ref-filter: consult want_color() before emitting colors 2017-07-13 12:42:51 -07:00
reflog-walk.c use MOVE_ARRAY 2017-07-17 14:54:56 -07:00
reflog-walk.h reflog-walk: apply --since/--until to reflog dates 2017-07-09 10:00:48 -07:00
refs.c Merge branch 'mh/ref-lock-entry' 2017-08-26 22:55:09 -07:00
refs.h Spelling fixes 2017-06-27 10:35:49 -07:00
remote-curl.c config: don't include config.h by default 2017-06-15 12:56:22 -07:00
remote-testsvn.c Merge branch 'ab/free-and-null' 2017-06-24 14:28:41 -07:00
remote.c Merge branch 'sb/hashmap-cleanup' 2017-08-11 13:27:01 -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 'bw/grep-recurse-submodules' 2017-08-22 10:29:01 -07:00
repository.h repo_read_index: don't discard the index 2017-07-18 13:32:25 -07:00
rerere.c rerere: allow approxidate in gc.rerereResolved/gc.rerereUnresolved 2017-08-22 14:51:02 -07:00
rerere.h Merge branch 'jc/rerere-multi' 2016-04-25 15:17:15 -07:00
resolve-undo.c cache: convert struct cache_entry to use struct object_id 2016-09-07 12:59:42 -07:00
resolve-undo.h
…
revision.c pack: move has_sha1_pack() 2017-08-23 15:12:07 -07:00
revision.h revision: add rev_input_given flag 2017-08-02 15:45:20 -07:00
run-command.c Merge branch 'js/run-process-parallel-api-fix' into maint 2017-08-23 14:33:49 -07:00
run-command.h run-command: expose is_executable function 2017-04-25 18:45:29 -07:00
send-pack.c Spelling fixes 2017-06-27 10:35:49 -07:00
send-pack.h Rename sha1_array to oid_array 2017-03-31 08:33:56 -07:00
sequencer.c Merge branch 'pw/sequence-rerere-autoupdate' 2017-08-22 10:29:00 -07:00
sequencer.h sequencer (rebase -i): learn about the 'verbose' mode 2017-01-09 14:57:29 -08:00
server-info.c pack: move {,re}prepare_packed_git and approximate_object_count 2017-08-23 15:12:07 -07:00
setup.c grep: recurse in-process using 'struct repository' 2017-08-02 14:26:46 -07:00
sh-i18n--envsubst.c remove unnecessary check before QSORT 2016-09-29 15:42:18 -07:00
sha1-array.c coccinelle: make use of the "type" FREE_AND_NULL() rule 2017-06-16 12:44:03 -07:00
sha1-array.h Rename sha1_array to oid_array 2017-03-31 08:33:56 -07:00
sha1-lookup.c sha1_file: drop experimental GIT_USE_LOOKUP search 2017-08-09 11:03:35 -07:00
sha1-lookup.h
…
sha1_file.c Merge branch 'po/read-graft-line' 2017-09-06 13:11:25 +09:00
sha1_name.c pack: move open_pack_index(), parse_pack_index() 2017-08-23 15:12:06 -07:00
sha1dc_git.c sha1dc: update from upstream 2017-05-22 10:20:46 +09:00
sha1dc_git.h sha1dc: update from upstream 2017-05-22 10:20:46 +09:00
shallow.c tempfile: auto-allocate tempfiles on heap 2017-09-06 17:19:54 +09:00
shell.c Merge branch 'maint-2.8' into maint-2.9 2017-05-05 13:13:48 +09:00
shortlog.h shortlog: group by committer information 2016-12-15 16:19:13 -08:00
show-index.c common-main: call git_setup_gettext() 2016-07-01 15:09:10 -07:00
sideband.c Merge branch 'lf/recv-sideband-cleanup' into maint 2016-08-08 14:21:41 -07:00
sideband.h sideband.c: make send_sideband() return void 2016-06-16 11:40:19 -07:00
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/strbuf-getwholeline-fix' 2017-08-22 10:29:15 -07:00
strbuf.h strbuf: use designated initializers in STRBUF_INIT 2017-07-14 08:32:44 -07:00
streaming.c pack: move use_pack() 2017-08-23 15:12:06 -07:00
streaming.h streaming: make stream_blob_to_fd take struct object_id 2016-09-07 12:59:42 -07:00
string-list.c use MOVE_ARRAY 2017-07-17 14:54:56 -07:00
string-list.h string-list: add string_list_remove function 2017-04-20 17:55:32 -07:00
sub-process.c Merge branch 'cc/subprocess-handshake-missing-capabilities' 2017-08-24 10:20:02 -07:00
sub-process.h Merge branch 'jt/subprocess-handshake' 2017-08-11 13:27:05 -07:00
submodule-config.c Merge branch 'bw/submodule-config-cleanup' 2017-08-26 22:55:08 -07:00
submodule-config.h Merge branch 'bw/grep-recurse-submodules' 2017-08-22 10:29:01 -07:00
submodule.c Merge branch 'bw/submodule-config-cleanup' 2017-08-26 22:55:08 -07:00
submodule.h Merge branch 'bw/submodule-config-cleanup' 2017-08-26 22:55:08 -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: auto-allocate tempfiles on heap 2017-09-06 17:19:54 +09:00
tempfile.h tempfile: auto-allocate tempfiles on heap 2017-09-06 17:19:54 +09:00
thread-utils.c
…
thread-utils.h
…
tmp-objdir.c tmp-objdir: quote paths we add to alternates 2016-12-12 15:10:46 -08:00
tmp-objdir.h tmp-objdir: introduce API for temporary object directories 2016-10-10 13:54:02 -07:00
trace.c trace: do not fall back to stderr 2016-08-05 09:28:17 -07:00
trace.h
…
trailer.c tempfile: auto-allocate tempfiles on heap 2017-09-06 17:19:54 +09:00
trailer.h Merge branch 'jk/trailers-parse' 2017-08-26 22:55:04 -07:00
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 for_each_alternate_ref: pass name/oid instead of ref struct 2017-02-08 15:39:55 -08:00
tree-diff.c tree-walk: convert fill_tree_descriptor() to object_id 2017-08-14 12:38:54 -07:00
tree-walk.c tree-walk: convert fill_tree_descriptor() to object_id 2017-08-14 12:38:54 -07:00
tree-walk.h tree-walk: convert fill_tree_descriptor() to object_id 2017-08-14 12:38:54 -07:00
tree.c Merge branch 'ab/free-and-null' 2017-06-24 14:28:41 -07:00
tree.h tree: convert read_tree to take an index parameter 2017-06-13 11:40:51 -07:00
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 Merge branch 'bw/submodule-config-cleanup' 2017-08-26 22:55:08 -07:00
unpack-trees.h unpack-trees: check if we can perform the operation for submodules 2017-03-16 14:07:16 -07:00
upload-pack.c Merge branch 'bw/config-h' 2017-06-24 14:28:41 -07:00
url.c introduce hex2chr() for converting two hexadecimal digits to a character 2016-09-07 10:42:46 -07:00
url.h
…
urlmatch.c urlmatch: use hex2chr() in append_normalized_escapes() 2017-07-09 09:43:01 -07:00
urlmatch.h urlmatch: include host in urlmatch ranking 2017-02-01 13:22:46 -08:00
usage.c die(): stop hiding errors due to overzealous recursion guard 2017-06-21 14:09:13 -07:00
userdiff.c config: don't include config.h by default 2017-06-15 12:56:22 -07:00
userdiff.h diff: clarify textconv interface 2016-02-22 10:40:35 -08:00
utf8.c utf8: accept "latin-1" as ISO-8859-1 2016-09-26 18:16:23 -07:00
utf8.h typofix: assorted typofixes in comments, documentation and messages 2016-05-06 13:16:37 -07:00
varint.c
…
varint.h
…
version.c
…
version.h
…
versioncmp.c config: don't include config.h by default 2017-06-15 12:56:22 -07:00
walker.c object: convert parse_object* to take struct object_id 2017-05-08 15:12:58 +09:00
walker.h walker: let walker_say take arbitrary formats 2016-07-08 10:11:23 -07:00
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 worktree.c: kill parse_ref() in favor of refs_resolve_ref_unsafe() 2017-04-24 21:28:55 -07:00
wrap-for-bin.sh wrap-for-bin.sh: regenerate bin-wrappers when switching branches 2016-05-10 13:23:34 -07:00
wrapper.c Merge branch 'bw/config-h' 2017-06-24 14:28:41 -07:00
write_or_die.c run-command: move check_pipe() from write_or_die to run_command 2016-10-17 11:36:49 -07:00
ws.c attr: convert git_check_attrs() callers to use the new API 2017-02-01 13:46:52 -08:00
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 Convert read_mmblob to take struct object_id. 2016-09-07 12:59:42 -07:00
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