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

Fix path separator bug on Windows that completely broke git-annex since version 7.20190122.

Browse source
This commit is contained in:
Joey Hess 2019-02-18 17:16:39 -04:00
parent 2eb07091e8
commit 1a367cad83
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
3 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Annex/Link.hs
View file

@ -290,12 +290,12 @@ isPointerFile f = catchDefaultIO Nothing $ withFile f ReadMode $ \h ->
isLinkToAnnex :: S.ByteString -> Bool
isLinkToAnnex s = p `S.isInfixOf` s
#ifdef mingw32_HOST_OS
-- '/' is still used inside pointer files on Windows, not the native
-- '\'
-- '/' is used inside pointer files on Windows, not the native '\'
|| p' `S.isInfixOf` s
#endif
where
p = toRawFilePath (pathSeparator:objectDir)
sp = (pathSeparator:objectDir)
p = toRawFilePath sp
#ifdef mingw32_HOST_OS
p' = toRawFilePath ('/':objectDir)
p' = toRawFilePath (toInternalGitPath sp)
#endif

2
CHANGELOG
View file

@ -29,6 +29,8 @@ git-annex (7.20190130) UNRELEASED; urgency=medium
package.
* init: Fix bug when direct mode needs to be enabled on a crippled
filesystem, that left the repository in indirect mode.
* Fix path separator bug on Windows that completely broke git-annex
since version 7.20190122.
-- Joey Hess <id@joeyh.name> Wed, 30 Jan 2019 12:30:22 -0400

10
doc/bugs/windows_support_totally_bitrotted/comment_2_4a37c0d8abbc64abd383d0d306be31f6._comment Normal file
View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="joey"
subject="""comment 2"""
date="2019-02-18T21:03:54Z"
content="""
isLinkToAnnex failing on windows because of mixed path separator issues
caused by [[!commit 5d98cba923e541be4dc9fd36f5f3c4a37b465bf1]].
Verified it's working in both direct and v7 unlocked with that fixed.
"""]]