diff options
| author |  Joey Hess <joey@kitenet.net> | 2011-10-07 13:38:56 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2011-10-07 13:38:56 -0400 |
| commit | 82e655efd060ce3c674681b0c51f2efc1efa069d (patch) | |
| tree | 2833e4c40ab1bb166f7d6b4063f7b56f2392d707 | |
| parent | 44fc358885f2d6ae20afb21d9526a14b2966901c (diff) | |
performance fix
It was checking if it needed to merge on every branch access, fix it to
only check once.
| -rw-r--r-- | Annex/Branch.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Annex/Branch.hs b/Annex/Branch.hs index ea8ac2cec..29e3a3956 100644 --- a/Annex/Branch.hs +++ b/Annex/Branch.hs @@ -153,8 +153,8 @@ update = do -} liftIO $ Git.UnionMerge.merge_index g branches liftIO $ Git.commit g "update" fullname (nub $ fullname:refs) - Annex.changeState $ \s -> s { Annex.branchstate = state { branchUpdated = True } } invalidateCache + Annex.changeState $ \s -> s { Annex.branchstate = state { branchUpdated = True } } where changedbranch (_, branch) = do g <- gitRepo |