summaryrefslogtreecommitdiff
path: root/Annex/Content.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2014-02-06 17:08:54 -0400
committerGravatar Joey Hess <joey@kitenet.net>2014-02-06 17:17:35 -0400
commit2d724015bdfdeb54d130d8e9a240f3fbe75306c7 (patch)
tree1f6f56812469df57af5971d47d7cbf3e564d4c9a /Annex/Content.hs
parentd802f73243adb29b4436d0f0fd80660d78dacc58 (diff)
work around absNormPath not working on Windows
When making git-annex links, we want unix-style paths in the link targets.
Diffstat (limited to 'Annex/Content.hs')
-rw-r--r--Annex/Content.hs4
1 files changed, 2 insertions, 2 deletions
diff --git a/Annex/Content.hs b/Annex/Content.hs
index 45e1fa182..6e494ecf4 100644
--- a/Annex/Content.hs
+++ b/Annex/Content.hs
@@ -436,8 +436,8 @@ removeAnnex key = withObjectLoc key remove removedirect
l <- inRepo $ gitAnnexLink f key
top <- fromRepo Git.repoPath
cwd <- liftIO getCurrentDirectory
- let top' = fromMaybe top $ absNormPath cwd top
- let l' = relPathDirToFile top' (fromMaybe l $ absNormPath top' l)
+ let top' = fromMaybe top $ absNormPathUnix cwd top
+ let l' = relPathDirToFile top' (fromMaybe l $ absNormPathUnix top' l)
secureErase f
replaceFile f $ makeAnnexLink l'