Sped up git-annex merge by using git hash-object --batch.

This does mean that it has to write out temp files containing updated
objects for the merge. So may use more disk space, and disk IO, but that
should generally win out over needing to launch N separate
git hash-object processes.
This commit is contained in:
Joey Hess 2016-03-14 16:23:22 -04:00
parent a27faf6999
commit 2d234de781
Failed to extract signature
3 changed files with 24 additions and 18 deletions

1
debian/changelog vendored
View file

@ -15,6 +15,7 @@ git-annex (6.20160230) UNRELEASED; urgency=medium
* Correct git-annex info to include unlocked files in v6 repository.
* Sped up git-annex add in direct mode and v6 by using
git hash-object --batch.
* Sped up git-annex merge by using git hash-object --batch.
-- Joey Hess <id@joeyh.name> Mon, 29 Feb 2016 13:00:30 -0400