diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-07-09 15:07:53 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-07-09 15:08:19 -0400 |
| commit | 79de0bb85e576b20117ce867ed76aab74815098d (patch) | |
| tree | 1610a43fd5cc605aa0b537e67341ac73536b3742 /Locations.hs | |
| parent | 32a2bf7d2050f8d639e41645069d745f7b7d56a3 (diff) | |
prospective fix for bad_merge_commit_deleting_all_files
Assuming my analysis of a race is correct. In any case, this certianly closes a
race..
Diffstat (limited to 'Locations.hs')
| -rw-r--r-- | Locations.hs | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Locations.hs b/Locations.hs index 95aba169c..d397a97be 100644 --- a/Locations.hs +++ b/Locations.hs @@ -42,6 +42,7 @@ module Locations ( gitAnnexJournalDir, gitAnnexJournalLock, gitAnnexPreCommitLock, + gitAnnexMergeLock, gitAnnexIndex, gitAnnexIndexStatus, gitAnnexViewIndex, @@ -262,6 +263,10 @@ gitAnnexJournalLock r = gitAnnexDir r </> "journal.lck" gitAnnexPreCommitLock :: Git.Repo -> FilePath gitAnnexPreCommitLock r = gitAnnexDir r </> "precommit.lck" +{- Lock file for direct mode merge. -} +gitAnnexMergeLock :: Git.Repo -> FilePath +gitAnnexMergeLock r = gitAnnexDir r </> "merge.lck" + {- .git/annex/index is used to stage changes to the git-annex branch -} gitAnnexIndex :: Git.Repo -> FilePath gitAnnexIndex r = gitAnnexDir r </> "index" |