diff options
Diffstat (limited to 'Assistant/Threads/Merger.hs')
| -rw-r--r-- | Assistant/Threads/Merger.hs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Assistant/Threads/Merger.hs b/Assistant/Threads/Merger.hs index 3f4fcb0cc..8c406990a 100644 --- a/Assistant/Threads/Merger.hs +++ b/Assistant/Threads/Merger.hs @@ -80,8 +80,8 @@ onChange file mergecurrent (Just current) | equivBranches changedbranch current = do debug - [ "merging", show changedbranch - , "into", show current + [ "merging", Git.fromRef changedbranch + , "into", Git.fromRef current ] void $ liftAnnex $ Command.Sync.mergeFrom changedbranch mergecurrent _ = noop @@ -105,12 +105,12 @@ onChange file equivBranches :: Git.Ref -> Git.Ref -> Bool equivBranches x y = base x == base y where - base = takeFileName . show + base = takeFileName . Git.fromRef isAnnexBranch :: FilePath -> Bool isAnnexBranch f = n `isSuffixOf` f where - n = '/' : show Annex.Branch.name + n = '/' : Git.fromRef Annex.Branch.name fileToBranch :: FilePath -> Git.Ref fileToBranch f = Git.Ref $ "refs" </> base |