diff options
| author |  Joey Hess <joey@kitenet.net> | 2011-11-12 17:45:12 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2011-11-12 17:45:12 -0400 |
| commit | 04edae6791b4eddaa77dda2407264dc4434d74b7 (patch) | |
| tree | 3c42dfa812220f003b53cb47ce4ff1e73dd1f108 /doc | |
| parent | cea65b9e5bf6bcc9a9350703dbbb0951c6e00c82 (diff) | |
Optimised union merging; now only runs git cat-file once.
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/todo/optimise_git-annex_merge.mdwn | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/doc/todo/optimise_git-annex_merge.mdwn b/doc/todo/optimise_git-annex_merge.mdwn index a2cdfb15f..2df196cfd 100644 --- a/doc/todo/optimise_git-annex_merge.mdwn +++ b/doc/todo/optimise_git-annex_merge.mdwn @@ -8,6 +8,10 @@ Instead, I'd like a way to stream multiple objects into git using stdin. Sometime, should look at either extending git-hash-object to support that, or possibly look at using git-fast-import instead. +--- + `git-annex merge` also runs `git show` once per file that needs to be merged. This could be reduced to a single call to `git-cat-file --batch`, There is already a Git.CatFile library that can do this easily. --[[Joey]] + +> This is now done, part above remains todo. --[[Joey]] |