summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-06-17 21:18:43 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-06-17 21:18:43 -0400
commit278d5fea4caef3c159cb7525f2aa4399baea95dd (patch)
treed7154f5f6bd92ce15a0f6984d937227caa38fa7d
parenta61df2dd0467435857af76c9f5c371419f25a75c (diff)
fsck: Avoid getting confused by Windows path separators
-rw-r--r--Command/Fsck.hs2
-rw-r--r--debian/changelog1
2 files changed, 2 insertions, 1 deletions
diff --git a/Command/Fsck.hs b/Command/Fsck.hs
index a831dceb4..a9481ba7c 100644
--- a/Command/Fsck.hs
+++ b/Command/Fsck.hs
@@ -207,7 +207,7 @@ fixLink key file = do
return True
where
go want have
- | want /= have = do
+ | want /= fromInternalGitPath have = do
showNote "fixing link"
liftIO $ createDirectoryIfMissing True (parentDir file)
liftIO $ removeFile file
diff --git a/debian/changelog b/debian/changelog
index c433d2bf0..a31d5c457 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -30,6 +30,7 @@ git-annex (4.20130602) UNRELEASED; urgency=low
* status: No longer shows dead repositories.
* annex.debug can now be set to enable debug logging by default.
The webapp's debugging check box does this.
+ * fsck: Avoid getting confused by Windows path separators
-- Joey Hess <joeyh@debian.org> Mon, 10 Jun 2013 12:52:44 -0400