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

force files relative

Browse source 
Other code is currently depending on checkAttr forcing absolute filenames
to relative, so keep it doing so.

This is a quick fix, and should sometime be moved elsewhere.
This commit is contained in:
Joey Hess 2011-10-11 23:39:29 -04:00
parent 11b154e811
commit 5a9e3f7377
1 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Git.hs
View file

@ -547,10 +547,12 @@ configMap = config
{- Efficiently looks up a gitattributes value for each file in a list. -} {- Efficiently looks up a gitattributes value for each file in a list. -}
checkAttr :: Repo -> String -> [FilePath] -> IO [(FilePath, String)] checkAttr :: Repo -> String -> [FilePath] -> IO [(FilePath, String)]
checkAttr repo attr files = do checkAttr repo attr files = do
cwd <- getCurrentDirectory
let relfiles = map (relPathDirToFile cwd . absPathFrom cwd) files
(_, fromh, toh) <- hPipeBoth "git" (toCommand params) (_, fromh, toh) <- hPipeBoth "git" (toCommand params)
_ <- forkProcess $ do _ <- forkProcess $ do
hClose fromh hClose fromh
hPutStr toh $ join "\0" files hPutStr toh $ join "\0" relfiles
hClose toh hClose toh
exitSuccess exitSuccess
hClose toh hClose toh