diff options
Diffstat (limited to 'Assistant/Threads/Merger.hs')
| -rw-r--r-- | Assistant/Threads/Merger.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Assistant/Threads/Merger.hs b/Assistant/Threads/Merger.hs index 650293e4b..3f4fcb0cc 100644 --- a/Assistant/Threads/Merger.hs +++ b/Assistant/Threads/Merger.hs @@ -54,7 +54,7 @@ runHandler handler file _filestatus = {- Called when there's an error with inotify. -} onErr :: Handler -onErr msg = error msg +onErr = error {- Called when a new branch ref is written, or a branch ref is modified. - @@ -110,7 +110,7 @@ equivBranches x y = base x == base y isAnnexBranch :: FilePath -> Bool isAnnexBranch f = n `isSuffixOf` f where - n = "/" ++ show Annex.Branch.name + n = '/' : show Annex.Branch.name fileToBranch :: FilePath -> Git.Ref fileToBranch f = Git.Ref $ "refs" </> base |