From 0ffe5408ae1b396453f080bef2858542317daf23 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 28 Aug 2013 15:57:42 -0400 Subject: untested transition detection on merging, and transition running code --- Locations.hs | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'Locations.hs') 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" -- cgit v1.2.3