Go to file
Johannes Schindelin 548009c0d5 merge_trees(): ensure that the callers release output buffer
The recursive merge machinery accumulates its output in an output
buffer, to be flushed at the end of merge_recursive(). At this point,
we forgot to release the output buffer.

When calling merge_trees() (i.e. the non-recursive part of the recursive
merge) directly, the output buffer is never flushed because the caller
may be merge_recursive() which wants to flush the output itself.

For the same reason, merge_trees() cannot release the output buffer: it
may still be needed.

Forgetting to release the output buffer did not matter much when running
git-checkout, or git-merge-recursive, because we exited after the
operation anyway. Ever since cherry-pick learned to pick a commit range,
however, this memory leak had the potential of becoming a problem.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-08-01 11:45:30 -07:00
Documentation Seventh batch of topics for 2.10 2016-07-25 14:17:28 -07:00
block-sha1
builtin merge_trees(): ensure that the callers release output buffer 2016-08-01 11:45:30 -07:00
ci travis-ci: build documentation 2016-05-10 11:19:07 -07:00
compat Merge branch 'jk/common-main' 2016-07-19 13:22:19 -07:00
contrib Merge branch 'bc/cocci' 2016-07-19 13:22:16 -07:00
ewah
git-gui
gitk-git
gitweb Merge branch 'sk/gitweb-highlight-encoding' into HEAD 2016-05-18 14:40:10 -07:00
mergetools
perl git-svn: warn instead of dying when commit data is missing 2016-07-09 22:53:54 +00:00
po Merge branch 'va/i18n-even-more' 2016-07-13 11:24:10 -07:00
ppc
refs Merge branch 'mh/ref-iterators' 2016-07-25 14:13:33 -07:00
t t5520: verify that `pull --rebase` shows the helpful advice when failing 2016-07-26 11:13:44 -07:00
templates
vcs-svn vcs-svn: use error_errno() 2016-05-09 12:29:08 -07:00
xdiff Merge branch 'js/ignore-space-at-eol' 2016-07-25 14:13:35 -07:00
.gitattributes .gitattributes: set file type for C files 2016-07-07 14:11:15 -07:00
.gitignore
.mailmap mailmap: use main email address for dturner 2016-07-06 10:57:01 -07:00
.travis.yml Merge branch 'ls/travis-enable-httpd-tests' 2016-07-25 14:13:40 -07:00
COPYING
GIT-VERSION-GEN Git 2.9.2 2016-07-15 10:48:16 -07:00
INSTALL
LGPL-2.1
Makefile Merge branch 'nd/test-helpers' 2016-07-25 14:13:42 -07:00
README.md README.md: format CLI commands with code syntax 2016-05-31 08:54:24 -07:00
RelNotes Git 2.9.2 2016-07-15 10:48:16 -07:00
abspath.c
aclocal.m4
advice.c i18n: advice: internationalize message for conflicts 2016-06-17 15:45:48 -07:00
advice.h
alias.c
alloc.c
archive-tar.c archive-tar: huge offset and future timestamps would not work on 32-bit 2016-07-15 10:51:55 -07:00
archive-zip.c
archive.c pathspec: rename free_pathspec() to clear_pathspec() 2016-06-02 14:09:22 -07:00
archive.h
argv-array.c
argv-array.h
attr.c
attr.h
base85.c
bisect.c Merge branch 'jk/printf-format' 2016-07-19 13:22:22 -07:00
bisect.h
blob.c
blob.h
branch.c worktree.c: check whether branch is rebased in another worktree 2016-04-22 14:09:38 -07:00
branch.h worktree.c: check whether branch is rebased in another worktree 2016-04-22 14:09:38 -07:00
builtin.h
bulk-checkin.c
bulk-checkin.h
bundle.c
bundle.h
cache-tree.c cache-tree: do not generate empty trees as a result of all i-t-a subentries 2016-07-18 13:45:33 -07:00
cache-tree.h
cache.h Merge branch 'jc/renormalize-merge-kill-safer-crlf' 2016-07-25 14:13:39 -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 Merge branch 'jk/ansi-color' 2016-07-11 10:31:05 -07:00
color.h Merge branch 'js/color-on-windows-comment' 2016-07-11 10:31:09 -07:00
column.c
column.h
combine-diff.c Merge branch 'bc/cocci' 2016-07-19 13:22:16 -07:00
command-list.txt
commit-slab.h
commit.c Merge branch 'jk/printf-format' 2016-07-19 13:22:22 -07:00
commit.h Merge branch 'jk/printf-format' 2016-07-19 13:22:22 -07:00
common-main.c mingw: declare main()'s argv as const 2016-07-06 08:11:47 -07:00
config.c Merge branch 'jk/upload-pack-hook' 2016-07-06 13:38:11 -07:00
config.mak.in
config.mak.uname config.mak.uname: define NEEDS_LIBRT under Linux, for now 2016-07-11 11:44:18 -07:00
configure.ac Merge branch 'ew/autoconf-pthread' 2016-07-25 14:13:46 -07:00
connect.c connect: read $GIT_SSH_COMMAND from config file 2016-07-06 14:04:09 -07:00
connect.h
connected.c connected.c: use error_errno() 2016-05-09 12:29:08 -07:00
connected.h
convert.c convert: unify the "auto" handling of CRLF 2016-07-06 11:53:51 -07:00
convert.h convert: unify the "auto" handling of CRLF 2016-07-06 11:53:51 -07:00
copy.c copy.c: use error_errno() 2016-05-09 12:29:08 -07:00
credential-cache--daemon.c Merge branch 'jk/common-main-2.8' into jk/common-main 2016-07-06 10:02:57 -07:00
credential-cache.c add an extra level of indirection to main() 2016-07-01 15:09:10 -07:00
credential-store.c add an extra level of indirection to main() 2016-07-01 15:09:10 -07:00
credential.c
credential.h
csum-file.c
csum-file.h
ctype.c
daemon.c Merge branch 'jk/common-main' 2016-07-19 13:22:19 -07:00
date.c local_tzoffset: detect errors from tm_to_time_t 2016-06-20 15:08:07 -07:00
decorate.c
decorate.h
delta.h
diff-delta.c
diff-lib.c
diff-no-index.c diff-no-index.c: use error_errno() 2016-05-09 12:29:08 -07:00
diff.c Merge branch 'bc/cocci' 2016-07-19 13:22:16 -07:00
diff.h
diffcore-break.c diff: rename struct diff_filespec's sha1_valid member 2016-06-28 11:39:02 -07:00
diffcore-delta.c
diffcore-order.c
diffcore-pickaxe.c diffcore-pickaxe: support case insensitive match on non-ascii 2016-07-01 12:44:57 -07:00
diffcore-rename.c diff: rename struct diff_filespec's sha1_valid member 2016-06-28 11:39:02 -07:00
diffcore.h diff: rename struct diff_filespec's sha1_valid member 2016-06-28 11:39:02 -07: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/use-strbuf-addbuf' 2016-07-25 14:13:47 -07:00
dir.h Merge branch 'mh/split-under-lock' 2016-07-25 14:13:32 -07:00
editor.c editor.c: use error_errno() 2016-05-09 12:29:08 -07:00
entry.c entry.c: use error_errno() 2016-05-09 12:29:08 -07:00
environment.c Merge branch 'js/windows-dotgit' into maint 2016-05-26 13:17:23 -07:00
exec_cmd.c
exec_cmd.h
fast-import.c Merge branch 'jk/common-main' 2016-07-19 13:22:19 -07:00
fetch-pack.c
fetch-pack.h
fmt-merge-msg.h
fsck.c fsck: optionally show more helpful info for broken links 2016-07-18 15:15:59 -07:00
fsck.h fsck: give the error function a chance to see the fsck_options 2016-07-18 11:35:00 -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 add--interactive: respect diff.compactionHeuristic 2016-06-16 11:38:58 -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 Merge branch 'jk/common-main' 2016-07-19 13:22:19 -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/mergetool: make the form of yes/no questions consistent 2016-04-25 15:15:17 -07:00
git-difftool.perl difftool: handle unmerged files in dir-diff mode 2016-05-16 14:53:05 -07:00
git-filter-branch.sh
git-instaweb.sh
git-merge-octopus.sh i18n: git-sh-setup.sh: mark strings for translation 2016-06-17 15:45:48 -07:00
git-merge-one-file.sh
git-merge-resolve.sh
git-mergetool--lib.sh Merge branch 'nf/mergetool-prompt' 2016-05-03 14:08:17 -07:00
git-mergetool.sh Merge branch 'nf/mergetool-prompt' into HEAD 2016-05-18 14:40:07 -07:00
git-p4.py Merge branch 'ls/p4-tmp-refs' 2016-07-19 13:22:24 -07:00
git-parse-remote.sh
git-quiltimport.sh
git-rebase--am.sh rebase: update comment about FreeBSD /bin/sh 2016-06-17 11:04:38 -07:00
git-rebase--interactive.sh Merge branch 'ps/rebase-i-auto-unstash-upon-abort' 2016-07-13 11:24:17 -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 i18n: git-sh-setup.sh: mark strings for translation 2016-06-17 15:45:48 -07:00
git-relink.perl
git-remote-testgit.sh
git-request-pull.sh
git-send-email.perl Merge branch 'jc/send-email-skip-backup' 2016-07-11 10:31:04 -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-07-13 11:24:10 -07:00
git-stash.sh i18n: git-sh-setup.sh: mark strings for translation 2016-06-17 15:45:48 -07:00
git-submodule.sh Merge branch 'va/i18n-even-more' 2016-07-13 11:24:10 -07:00
git-svn.perl git-svn: clone: Fail on missing url argument 2016-07-03 06:04:47 +00:00
git-web--browse.sh
git.c common-main: call git_setup_gettext() 2016-07-01 15:09:10 -07:00
git.rc
gpg-interface.c gpg-interface: check gpg signature creation status 2016-06-17 17:03:57 -07:00
gpg-interface.h
graph.c Merge branch 'js/log-to-diffopt-file' 2016-07-19 13:22:15 -07:00
graph.h pretty: pass graph width to pretty formatting for use in '%>|(N)' 2016-06-16 11:43:36 -07:00
grep.c die("bug"): report bugs consistently 2016-07-26 11:13:44 -07:00
grep.h grep/pcre: prepare locale-dependent tables for icase matching 2016-07-01 12:44:57 -07:00
hashmap.c
hashmap.h
help.c t0006: skip "far in the future" test when unsigned long is not long enough 2016-07-15 09:05:53 -07:00
help.h
hex.c hex: add oid_to_hex_r() 2016-06-28 11:39:02 -07:00
http-backend.c Merge branch 'jk/common-main-2.8' into jk/common-main 2016-07-06 10:02:57 -07:00
http-fetch.c common-main: call git_setup_gettext() 2016-07-01 15:09:10 -07:00
http-push.c Merge branch 'jk/common-main-2.8' into jk/common-main 2016-07-06 10:02:57 -07:00
http-walker.c
http.c Merge branch 'ep/http-curl-trace' 2016-07-06 13:38:06 -07:00
http.h Merge branch 'ep/http-curl-trace' 2016-07-06 13:38:06 -07:00
ident.c Merge branch 'da/user-useconfigonly' into HEAD 2016-05-18 14:40:05 -07:00
imap-send.c die("bug"): report bugs consistently 2016-07-26 11:13:44 -07:00
iterator.h refs: introduce an iterator interface 2016-06-20 11:38:20 -07:00
khash.h
kwset.c
kwset.h
levenshtein.c
levenshtein.h
line-log.c Merge branch 'bc/cocci' 2016-07-19 13:22:16 -07:00
line-log.h
line-range.c
line-range.h
list-objects.c struct name_entry: use struct object_id instead of unsigned char sha1[20] 2016-04-25 14:23:42 -07:00
list-objects.h
ll-merge.c Merge branch 'jc/ll-merge-internal' 2016-05-17 14:38:32 -07:00
ll-merge.h
lockfile.c
lockfile.h
log-tree.c Merge branch 'js/log-to-diffopt-file' 2016-07-19 13:22:15 -07:00
log-tree.h
mailinfo.c
mailinfo.h
mailmap.c Merge branch 'nd/error-errno' 2016-05-17 14:38:28 -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-blobs.h
merge-recursive.c merge_trees(): ensure that the callers release output buffer 2016-08-01 11:45:30 -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
mergesort.c
mergesort.h
name-hash.c
notes-cache.c
notes-cache.h
notes-merge.c Merge branch 'bc/cocci' 2016-07-19 13:22:16 -07:00
notes-merge.h
notes-utils.c
notes-utils.h
notes.c use string_list initializer consistently 2016-06-13 10:37:51 -07:00
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 Merge branch 'jk/parseopt-string-list' into jk/string-list-static-init 2016-06-13 10:37:48 -07:00
parse-options.c parse-options.c: make OPTION_COUNTUP respect "unspecified" values 2016-05-05 11:52:45 -07:00
parse-options.h
patch-delta.c
patch-ids.c patch-ids: make commit_patch_id() a public helper function 2016-04-26 10:49:57 -07:00
patch-ids.h patch-ids: make commit_patch_id() a public helper function 2016-04-26 10:49:57 -07:00
path.c Merge branch 'rs/use-strbuf-addbuf' 2016-07-25 14:13:47 -07:00
pathspec.c pathspec: rename free_pathspec() to clear_pathspec() 2016-06-02 14:09:22 -07:00
pathspec.h pathspec: rename free_pathspec() to clear_pathspec() 2016-06-02 14:09:22 -07:00
pkt-line.c
pkt-line.h
preload-index.c
pretty.c Merge branch 'nd/graph-width-padded' into maint 2016-07-11 10:44:09 -07:00
prio-queue.c
prio-queue.h
progress.c
progress.h
prompt.c
prompt.h
quote.c Merge branch 'nd/icase' 2016-07-19 13:22:17 -07:00
quote.h Merge branch 'nd/icase' 2016-07-19 13:22:17 -07:00
reachable.c reachable.c: use error_errno() 2016-05-09 12:29:08 -07:00
reachable.h
read-cache.c Merge branch 'jc/renormalize-merge-kill-safer-crlf' 2016-07-25 14:13:39 -07:00
ref-filter.c
ref-filter.h
reflog-walk.c reflog: continue walking the reflog past root commits 2016-06-06 15:06:44 -07:00
reflog-walk.h
refs.c do_for_each_ref(): reimplement using reference iteration 2016-06-20 11:38:20 -07:00
refs.h Merge branch 'mh/ref-iterators' 2016-07-25 14:13:33 -07:00
remote-curl.c Merge branch 'jk/common-main-2.8' into jk/common-main 2016-07-06 10:02:57 -07:00
remote-testsvn.c common-main: call git_extract_argv0_path() 2016-07-01 15:09:10 -07:00
remote.c Merge branch 'nd/remote-plural-ours-plus-theirs' into maint 2016-05-26 13:17:18 -07:00
remote.h
replace_object.c
rerere.c Merge branch 'jc/rerere-multi' 2016-05-23 14:54:38 -07:00
rerere.h Merge branch 'jc/rerere-multi' 2016-04-25 15:17:15 -07:00
resolve-undo.c
resolve-undo.h
revision.c Merge branch 'mj/log-show-signature-conf' 2016-07-11 10:31:08 -07:00
revision.h
run-command.c run-command: add pipe_command helper 2016-06-17 17:03:56 -07:00
run-command.h run-command: add pipe_command helper 2016-06-17 17:03:56 -07:00
send-pack.c send-pack: use buffered I/O to talk to pack-objects 2016-06-08 16:02:40 -07:00
send-pack.h
sequencer.c merge_trees(): ensure that the callers release output buffer 2016-08-01 11:45:30 -07:00
sequencer.h
server-info.c server-info.c: use error_errno() 2016-05-09 12:29:08 -07:00
setup.c i18n: setup: mark strings for translation 2016-06-17 15:45:48 -07:00
sh-i18n--envsubst.c add an extra level of indirection to main() 2016-07-01 15:09:10 -07:00
sha1-array.c
sha1-array.h
sha1-lookup.c
sha1-lookup.h
sha1_file.c die("bug"): report bugs consistently 2016-07-26 11:13:44 -07:00
sha1_name.c Merge branch 'bc/object-id' 2016-05-06 14:45:44 -07:00
shallow.c
shell.c common-main: call git_setup_gettext() 2016-07-01 15:09:10 -07:00
shortlog.h shortlog: support outputting to streams other than stdout 2016-06-24 14:25:49 -07: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' 2016-07-19 13:22:14 -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 typofix: assorted typofixes in comments, documentation and messages 2016-05-06 13:16:37 -07:00
split-index.h
strbuf.c Merge branch 'rs/use-strbuf-addbuf' 2016-07-25 14:13:47 -07:00
strbuf.h Merge branch 'rs/use-strbuf-addbuf' 2016-07-25 14:13:47 -07:00
streaming.c
streaming.h
string-list.c string_list: use string-list API in unsorted_string_list_lookup() 2016-04-25 11:48:27 -07:00
string-list.h
submodule-config.c Merge branch 'bc/cocci' 2016-07-19 13:22:16 -07:00
submodule-config.h submodule-config: keep shallow recommendation around 2016-05-27 10:40:45 -07:00
submodule.c Merge branch 'bc/cocci' 2016-07-19 13:22:16 -07:00
submodule.h Merge branch 'jk/submodule-c-credential' 2016-05-17 14:38:25 -07:00
symlinks.c
tag.c
tag.h
tar.h
tempfile.c
tempfile.h
thread-utils.c
thread-utils.h
trace.c
trace.h
trailer.c die("bug"): report bugs consistently 2016-07-26 11:13:44 -07:00
trailer.h
transport-helper.c i18n: transport-helper.c: change N_() call to _() 2016-06-17 15:45:49 -07:00
transport.c die("bug"): report bugs consistently 2016-07-26 11:13:44 -07:00
transport.h
tree-diff.c Merge branch 'jk/avoid-unbounded-alloca' into maint 2016-07-06 13:06:39 -07:00
tree-walk.c tree-walk: convert tree_entry_extract() to use struct object_id 2016-04-25 14:26:28 -07:00
tree-walk.h tree-walk: convert tree_entry_extract() to use struct object_id 2016-04-25 14:26:28 -07:00
tree.c struct name_entry: use struct object_id instead of unsigned char sha1[20] 2016-04-25 14:23:42 -07:00
tree.h
unicode_width.h
unimplemented.sh
unix-socket.c
unix-socket.h
unpack-trees.c unpack-trees: fix English grammar in do-this-before-that messages 2016-06-27 08:29:36 -07:00
unpack-trees.h
update_unicode.sh
upload-pack.c Merge branch 'jk/common-main' 2016-07-19 13:22:19 -07:00
url.c
url.h
urlmatch.c
urlmatch.h
usage.c usage.c: add warning_errno() and error_errno() 2016-05-09 12:29:08 -07:00
userdiff.c userdiff: add built-in pattern for CSS 2016-06-03 14:45:56 -07:00
userdiff.h
utf8.c
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
walker.c walker: let walker_say take arbitrary formats 2016-07-08 10:11:23 -07:00
walker.h walker: let walker_say take arbitrary formats 2016-07-08 10:11:23 -07:00
wildmatch.c typofix: assorted typofixes in comments, documentation and messages 2016-05-06 13:16:37 -07:00
wildmatch.h
worktree.c Merge branch 'rs/worktree-use-strbuf-absolute-path' 2016-07-25 14:13:37 -07:00
worktree.h branch: do not rename a branch under bisect or rebase 2016-04-22 14:09:39 -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 'jk/write-file' 2016-07-19 13:22:23 -07:00
write_or_die.c write_or_die: remove the unused write_or_whine() function 2016-06-10 10:54:27 -07:00
ws.c
wt-status.c die("bug"): report bugs consistently 2016-07-26 11:13:44 -07:00
wt-status.h wt-status.c: split bisect detection out of wt_status_get_state() 2016-04-22 14:09:39 -07:00
xdiff-interface.c xdiff: don't trim common tail with -W 2016-05-31 13:08:56 -07:00
xdiff-interface.h
zlib.c

README.md

Git - fast, scalable, distributed revision control system

Git is a fast, scalable, distributed revision control system with an unusually rich command set that provides both high-level operations and full access to internals.

Git is an Open Source project covered by the GNU General Public License version 2 (some parts of it are under different licenses, compatible with the GPLv2). It was originally written by Linus Torvalds with help of a group of hackers around the net.

Please read the file INSTALL for installation instructions.

Many Git online resources are accessible from 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