From c30557594e97d525782ee413f93107d8829dd951 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 20 Apr 2021 12:42:57 -0400 Subject: [PATCH] remove now redundant function --- Annex/Journal.hs | 2 +- Annex/Locations.hs | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/Annex/Journal.hs b/Annex/Journal.hs index 9ce80d8c44..a8269a7e59 100644 --- a/Annex/Journal.hs +++ b/Annex/Journal.hs @@ -106,7 +106,7 @@ journalDirty = do - in the journal directory. -} journalFile :: RawFilePath -> Git.Repo -> RawFilePath -journalFile file repo = gitAnnexJournalDir' repo P. S.concatMap mangle file +journalFile file repo = gitAnnexJournalDir repo P. S.concatMap mangle file where mangle c | P.isPathSeparator c = S.singleton underscore diff --git a/Annex/Locations.hs b/Annex/Locations.hs index c44300a65e..7a3f63083e 100644 --- a/Annex/Locations.hs +++ b/Annex/Locations.hs @@ -63,7 +63,6 @@ module Annex.Locations ( gitAnnexFeedState, gitAnnexMergeDir, gitAnnexJournalDir, - gitAnnexJournalDir', gitAnnexJournalLock, gitAnnexGitQueueLock, gitAnnexIndex, @@ -432,10 +431,6 @@ gitAnnexJournalDir :: Git.Repo -> RawFilePath gitAnnexJournalDir r = P.addTrailingPathSeparator $ gitAnnexDir r P. "journal" -gitAnnexJournalDir' :: Git.Repo -> RawFilePath -gitAnnexJournalDir' r = - P.addTrailingPathSeparator $ gitAnnexDir r P. "journal" - {- Lock file for the journal. -} gitAnnexJournalLock :: Git.Repo -> RawFilePath gitAnnexJournalLock r = gitAnnexDir r P. "journal.lck"