diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-10-03 14:02:34 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-10-03 14:37:46 -0400 |
| commit | 2607479890ac2b2a1bd63aca10dd87c9199bf414 (patch) | |
| tree | d9422c5015740ff576b462fb50d303c557e4fc64 /Locations.hs | |
| parent | 0f2130f8f2a24af815315c3e9e79879cf900e7ea (diff) | |
lockJournal when running performTransitions
This may not strictly be needed -- the transition code bypasses the
journal. However, this ensures that the git-annex branch is only
committed with the journal locked. This will allow for further
improvements.
Diffstat (limited to 'Locations.hs')
| -rw-r--r-- | Locations.hs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Locations.hs b/Locations.hs index b05cdc076..2e9fd574a 100644 --- a/Locations.hs +++ b/Locations.hs @@ -223,7 +223,8 @@ gitAnnexJournalLock r = gitAnnexDir r </> "journal.lck" gitAnnexIndex :: Git.Repo -> FilePath gitAnnexIndex r = gitAnnexDir r </> "index" -{- Lock file for .git/annex/index. -} +{- Lock file for .git/annex/index. Not to be confused with git's + - index.lock. -} gitAnnexIndexLock :: Git.Repo -> FilePath gitAnnexIndexLock r = gitAnnexDir r </> "index.lck" |