diff options
author | Joey Hess <joey@kitenet.net> | 2011-10-11 23:39:29 -0400 |
---|---|---|
committer | Joey Hess <joey@kitenet.net> | 2011-10-11 23:39:29 -0400 |
commit | 5a9e3f73772daff3ffadd2359d99914f0567b78c (patch) | |
tree | 1b916d276a7e97c8dbd321777ae2df58095ea6a2 /Git.hs | |
parent | 11b154e811a9dcea42ceaaf9740f811ac310a615 (diff) |
force files relative
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.
Diffstat (limited to 'Git.hs')
-rw-r--r-- | Git.hs | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -547,10 +547,12 @@ configMap = config {- Efficiently looks up a gitattributes value for each file in a list. -} checkAttr :: Repo -> String -> [FilePath] -> IO [(FilePath, String)] checkAttr repo attr files = do + cwd <- getCurrentDirectory + let relfiles = map (relPathDirToFile cwd . absPathFrom cwd) files (_, fromh, toh) <- hPipeBoth "git" (toCommand params) _ <- forkProcess $ do hClose fromh - hPutStr toh $ join "\0" files + hPutStr toh $ join "\0" relfiles hClose toh exitSuccess hClose toh |