diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-12-31 16:39:11 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-12-31 16:39:11 -0400 |
| commit | 54ba0564dba0e6a7a9c5de23488d419b8fb54c08 (patch) | |
| tree | 6ded77a5351650778612f8aac9293e85cd3f7bc1 /Git | |
| parent | 3d4b0c157e682a4827dd098d256a16d38fbe6d26 (diff) | |
Windows: Fix bug in direct mode merge code that could cause files in subdirectories to go missing.
Diffstat (limited to 'Git')
| -rw-r--r-- | Git/DiffTree.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Git/DiffTree.hs b/Git/DiffTree.hs index e7787caee..c82cf78cd 100644 --- a/Git/DiffTree.hs +++ b/Git/DiffTree.hs @@ -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 |