diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-08-28 15:57:42 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-08-28 15:57:42 -0400 |
| commit | 0ffe5408ae1b396453f080bef2858542317daf23 (patch) | |
| tree | 1fe478130f94ac1d1535ce650aff6c0b86a831b8 /Locations.hs | |
| parent | 0a297232a206af8330dc4fe9acc5916d6ba32f19 (diff) | |
untested transition detection on merging, and transition running code
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 1cbbb9886..7762afb64 100644 --- a/Locations.hs +++ b/Locations.hs @@ -35,6 +35,7 @@ module Locations ( gitAnnexJournalLock, gitAnnexIndex, gitAnnexIndexLock, + gitAnnexIgnoredRefs, gitAnnexPidFile, gitAnnexDaemonStatusFile, gitAnnexLogFile, @@ -225,6 +226,10 @@ gitAnnexIndex r = gitAnnexDir r </> "index" gitAnnexIndexLock :: Git.Repo -> FilePath gitAnnexIndexLock r = gitAnnexDir r </> "index.lck" +{- List of refs that should not be merged into the git-annex branch. -} +gitAnnexIgnoredRefs :: Git.Repo -> FilePath +gitAnnexIgnoredRefs r = gitAnnexDir r </> "ignoredrefs" + {- Pid file for daemon mode. -} gitAnnexPidFile :: Git.Repo -> FilePath gitAnnexPidFile r = gitAnnexDir r </> "daemon.pid" |