diff options
| author |  Joey Hess <joey@kitenet.net> | 2011-06-23 11:37:26 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2011-06-23 11:37:26 -0400 |
| commit | 5f494154a34bad7cc54915a2a408b830e8ca77be (patch) | |
| tree | 2adfc75ea36e18b3655bb2dcfa94b702288fc6c5 /git-union-merge.hs | |
| parent | 23e765b67c38a9f02b3b5152e7e123819bb696de (diff) | |
add journaling to speed up changes to the git-annex branch
git is slow when the index file is large and has to be rewritten each time
a file is changed. To speed this up, added a journal where changes are
recorded before being fed into the index file and committed to the
git-annex branch. The entire journal can be fed into git with just 2
commands, and only one write of the index file.
Diffstat (limited to 'git-union-merge.hs')
| -rw-r--r-- | git-union-merge.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-union-merge.hs b/git-union-merge.hs index 7c0c1cd84..57232be67 100644 --- a/git-union-merge.hs +++ b/git-union-merge.hs @@ -42,7 +42,7 @@ main :: IO () main = do [aref, bref, newref] <- parseArgs g <- Git.configRead =<< Git.repoFromCwd - Git.useIndex (tmpIndex g) + _ <- Git.useIndex (tmpIndex g) setup g GitUnionMerge.merge g [aref, bref] GitUnionMerge.commit g "union merge" newref [aref, bref] |