| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 25 Aug 2011 23:00:29 +0000 (16:00 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 25 Aug 2011 23:00:29 +0000 (16:00 -0700) | ||
| commit | 7abd8fb36d90cc68d471a04b59846d7816609116 | |
| tree | 05d56b7a88106697cb72d6cee49e6c32cee09597 | tree | snapshot |
| parent | 22f65789753e2ee874b28a38410bc64d6099e895 | commit | diff |
| parent | 03f622c81fed05bb571519beacb0eeaf595c65f4 | commit | diff |
Merge branch 'jn/plug-empty-tree-leak'
* jn/plug-empty-tree-leak:
merge-recursive: take advantage of hardcoded empty tree
revert: plug memory leak in "cherry-pick root commit" codepath
* jn/plug-empty-tree-leak:
merge-recursive: take advantage of hardcoded empty tree
revert: plug memory leak in "cherry-pick root commit" codepath
| builtin/revert.c | diff1 | | diff2 | | blob | history |
| merge-recursive.c | diff1 | | diff2 | | blob | history |
| t/t3503-cherry-pick-root.sh | diff1 | | diff2 | | blob | history |