diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-02-09 15:24:33 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-02-09 15:37:26 -0400 |
| commit | d3aeb09c68cd0e58d5ffd29b09988b52daa42eff (patch) | |
| tree | 40d25dd28a7ea364a3947c6fe41c3664e86f32b4 /Locations.hs | |
| parent | c931516fb2de05e5b2bc2cb2d1548f9c6362c542 (diff) | |
Windows: Fix bug in dropping an annexed file, which caused a symlink to be staged that contained backslashes.
Diffstat (limited to 'Locations.hs')
| -rw-r--r-- | Locations.hs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Locations.hs b/Locations.hs index bf313dbc8..02995ee4a 100644 --- a/Locations.hs +++ b/Locations.hs @@ -75,6 +75,7 @@ import Types.Key import Types.UUID import Types.Difference import qualified Git +import Git.FilePath import Annex.DirHashes {- Conventions: @@ -154,7 +155,7 @@ gitAnnexLink file key r config = do currdir <- getCurrentDirectory let absfile = fromMaybe whoops $ absNormPathUnix currdir file loc <- gitAnnexLocation' key r config False - relPathDirToFile (parentDir absfile) loc + toInternalGitPath <$> relPathDirToFile (parentDir absfile) loc where whoops = error $ "unable to normalize " ++ file |