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 , srcsha = fromMaybe (error "bad srcsha") $ extractSha ssha
, dstsha = fromMaybe (error "bad dstsha") $ extractSha dsha , dstsha = fromMaybe (error "bad dstsha") $ extractSha dsha
, status = s , status = s
, file = asTopFilePath $ Git.Filename.decode f , file = asTopFilePath $ fromInternalGitPath $ Git.Filename.decode f
} }
where where
readmode = fst . Prelude.head . readOct readmode = fst . Prelude.head . readOct

2
debian/changelog vendored
View file

@ -1,6 +1,8 @@
git-annex (5.20131231) UNRELEASED; urgency=medium git-annex (5.20131231) UNRELEASED; urgency=medium
* external special remote protocol: Added GETUUID. * external special remote protocol: Added GETUUID.
* Windows: Fix bug in direct mode merge code that could cause files
in subdirectories to go missing.
-- Joey Hess <joeyh@debian.org> Tue, 31 Dec 2013 13:41:18 -0400 -- Joey Hess <joeyh@debian.org> Tue, 31 Dec 2013 13:41:18 -0400

9
doc/bugs/Test_test__95__mixed__95__conflict__95__resolution_fails_on_Windows_with___34__conflictor_directory_missing__34__.mdwn
View file

@ -1164,3 +1164,12 @@ git annex sync
cd .. cd ..
dir repo r1 r2 dir repo r1 r2
"""]] """]]
> Yet another wonderful case of \\ vs / confusion. [[fixed|done]].
>
> That sucked, but I am rather stunned that the rest of the test
> suite passes for you. That's a lot better that it's ever done on windows
> before. Sadly I don't have as much luck on XP, still 9 failing tests
> there.
>
> --[[Joey]]