diff options
| author | Joey Hess <joeyh@joeyh.name> | 2015-04-29 14:59:49 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-04-29 14:59:49 -0400 |
| commit | 36852d90bc18cb7b2bddb1ce9dce39cc1f0203de (patch) | |
| tree | 0419a1d67f6bb9db4ce79f8cb76b53752e2d7371 /Git/FilePath.hs | |
| parent | efe7e174bfab4d0dd2e88e7b6eb859940b2228ea (diff) | |
| download | git-repair-36852d90bc18cb7b2bddb1ce9dce39cc1f0203de.tar.gz | |
Merge from git-annex.
Diffstat (limited to 'Git/FilePath.hs')
| -rw-r--r-- | Git/FilePath.hs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Git/FilePath.hs b/Git/FilePath.hs index 42eb081..edc3c0f 100644 --- a/Git/FilePath.hs +++ b/Git/FilePath.hs @@ -5,7 +5,7 @@ - top of the repository even when run in a subdirectory. Adding some - types helps keep that straight. - - - Copyright 2012-2013 Joey Hess <joey@kitenet.net> + - Copyright 2012-2013 Joey Hess <id@joeyh.name> - - Licensed under the GNU GPL version 3 or higher. -} @@ -39,8 +39,7 @@ fromTopFilePath p repo = absPathFrom (repoPath repo) (getTopFilePath p) {- The input FilePath can be absolute, or relative to the CWD. -} toTopFilePath :: FilePath -> Git.Repo -> IO TopFilePath -toTopFilePath file repo = TopFilePath <$> - relPathDirToFile (repoPath repo) <$> absPath file +toTopFilePath file repo = TopFilePath <$> relPathDirToFile (repoPath repo) file {- The input FilePath must already be relative to the top of the git - repository -} |