diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-12-13 00:46:10 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-12-13 00:46:10 -0400 |
| commit | 49a456e8be7fcfdf22554bd2c019da7f9d77ec5f (patch) | |
| tree | 07d3e3ef1d83c374cdfaf6bbd76d7aeb05c5c29c /Annex | |
| parent | de6406afce6de0cf8a48bc2ecf9be1e7de93e40e (diff) | |
| parent | 7db480af0f944ca0e6c062cd1243c63ad7f878d1 (diff) | |
Merge branch 'master' into desymlink
Diffstat (limited to 'Annex')
| -rw-r--r-- | Annex/Branch.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Annex/Branch.hs b/Annex/Branch.hs index d0a74c709..69b68cf7a 100644 --- a/Annex/Branch.hs +++ b/Annex/Branch.hs @@ -116,7 +116,7 @@ updateTo pairs = do dirty <- journalDirty (refs, branches) <- unzip <$> filterM isnewer pairs if null refs - {- Even when no refs need to be merged, the index + {- Even when no refs need to be merged, the index - may still be updated if the branch has gotten ahead - of the index. -} then whenM (needUpdateIndex branchref) $ lockJournal $ do @@ -325,7 +325,7 @@ needUpdateIndex branchref = do - given ref of the branch. -} setIndexSha :: Git.Ref -> Annex () setIndexSha ref = do - lock <- fromRepo gitAnnexIndexLock + lock <- fromRepo gitAnnexIndexLock liftIO $ writeFile lock $ show ref ++ "\n" setAnnexPerm lock |