From 21a925dcf1ebe088b5c64da0ce159ffb6d535f04 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 15 Nov 2011 23:28:01 -0400 Subject: merge: Now runs in constant space. Before, a merge was first calculated, by running various actions that called git and built up a list of lines, which were at the end sent to git update-index. This necessarily used space proportional to the size of the diff between the trees being merged. Now, lines are streamed into git update-index from each of the actions in turn. Runtime size of git-annex merge when merging 50000 location log files drops from around 100 mb to a constant 4 mb. Presumably it runs quite a lot faster, too. --- debian/changelog | 1 + 1 file changed, 1 insertion(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index c145b14f9..37578f597 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,7 @@ git-annex (3.20111112) UNRELEASED; urgency=low displayed) * status: --fast is back * Fix support for insteadOf url remapping. Closes: #644278 + * merge: Now runs in constant space. -- Joey Hess Sat, 12 Nov 2011 14:50:21 -0400 -- cgit v1.2.3