summaryrefslogtreecommitdiff
path: root/Annex/Branch.hs
diff options
context:
space:
mode:
Diffstat (limited to 'Annex/Branch.hs')
-rw-r--r--Annex/Branch.hs4
1 files changed, 3 insertions, 1 deletions
diff --git a/Annex/Branch.hs b/Annex/Branch.hs
index c8d0719b0..1dacd5f32 100644
--- a/Annex/Branch.hs
+++ b/Annex/Branch.hs
@@ -35,6 +35,8 @@ import qualified Git.Branch
import qualified Git.UnionMerge
import qualified Git.UpdateIndex
import Git.HashObject
+import Git.Types
+import Git.FilePath
import qualified Git.Index
import Annex.CatFile
import Annex.Perms
@@ -344,5 +346,5 @@ stageJournal = do
let path = dir </> file
sha <- hashFile h path
_ <- streamer $ Git.UpdateIndex.update_index_line
- sha (fileJournal file)
+ sha FileBlob (asTopFilePath $ fileJournal file)
removeFile path