diff options
| author |  Joey Hess <joey@kitenet.net> | 2011-12-11 16:11:13 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2011-12-11 16:14:59 -0400 |
| commit | cfbbda99f4dd3e510e52dbb499d132300ad203e4 (patch) | |
| tree | 0d3a392a631e982b1ccba1c3bc390ece9f39e98a /git-union-merge.hs | |
| parent | 8680c415dedcc1fdbbcc0b9cdd7e37e860b22130 (diff) | |
optimize index updating
The last branch ref that the index was updated to is stored in
.git/annex/index.lck, and the index only updated when the current
branch ref differs.
(The .lck file should later be used for locking too.)
Some more optimization is still needed, since there is some redundancy in
calls to git show-ref.
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 1cec4a0f8..edd9330c8 100644 --- a/git-union-merge.hs +++ b/git-union-merge.hs @@ -42,5 +42,5 @@ main = do _ <- Git.useIndex (tmpIndex g) setup g Git.UnionMerge.merge aref bref g - Git.commit "union merge" newref [aref, bref] g + _ <- Git.commit "union merge" newref [aref, bref] g cleanup g |