mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

note

Browse source
This commit is contained in:
Joey Hess 2011-12-26 14:41:20 -04:00
parent d74f8db808
commit 6d74830afd
1 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
doc/todo/optimise_git-annex_merge.mdwn
View file

@ -21,3 +21,13 @@ There is already a Git.CatFile library that can do this easily. --[[Joey]]
Merging used to use memory proportional to the size of the diff. It now
streams data, running in constant space. This probably sped it up a lot,
as there's much less allocation and GC action. --[[Joey]]
----
Another option is to stop doing the automatic merging. Once the git
tweak-fetch hook is widely available, the automatic mergcing won't be
needed when pulling from remotes. The only remaining use would be if
a sibling git-annex branch appeared in some other way, and git annex merge
could be manually run in such an unlikely case. Making this change
would require a hard dependency on an appropriate version of git, and a
version number bump to ensure the tweak-fetch hooks are set up. --[[Joey]]