summaryrefslogtreecommitdiff
path: root/t/t9141-git-svn-multiple-branches.sh
diff options
context:
space:
mode:
authorJonathan Nieder <jrnieder@gmail.com>2011-08-16 13:27:39 -0500
committerJunio C Hamano <gitster@pobox.com>2011-08-16 13:06:13 -0700
commit03f622c81fed05bb571519beacb0eeaf595c65f4 (patch)
treef5a75b51e1309ec6e5ce684d6436e9d98d0c8f85 /t/t9141-git-svn-multiple-branches.sh
parent127f04522292fc62152762405c92d6acca4dbcb5 (diff)
downloadgit-03f622c81fed05bb571519beacb0eeaf595c65f4.tar.gz
merge-recursive: take advantage of hardcoded empty tree
When this code was first written (v1.4.3-rc1~174^2~4, merge-recur: if there is no common ancestor, fake empty one, 2006-08-09), everyone needing a fake empty tree had to make her own, but ever since v1.5.5-rc0~180^2~1 (2008-02-13), the object lookup machinery provides a ready-made one. Use it. This is just a simplification, though it also fixes a small leak (since the tree in the virtual common ancestor commit is never freed). Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t9141-git-svn-multiple-branches.sh')
0 files changed, 0 insertions, 0 deletions