mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Windows: Fix bug in direct mode merge code that could cause files in subdirectories to go missing.

Browse source
This commit is contained in:
Joey Hess 2013-12-31 16:39:11 -04:00
parent 341b72fd9a
commit 49aad120b9
3 changed files with 12 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Git/DiffTree.hs
View file

@ -87,7 +87,7 @@ parseDiffTree l = go l []
, srcsha = fromMaybe (error "bad srcsha") $ extractSha ssha
, dstsha = fromMaybe (error "bad dstsha") $ extractSha dsha
, status = s
, file = asTopFilePath $ Git.Filename.decode f
, file = asTopFilePath $ fromInternalGitPath $ Git.Filename.decode f
}
where
readmode = fst . Prelude.head . readOct