diff options
| author | Joey Hess <joeyh@joeyh.name> | 2020-01-02 12:34:10 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2020-01-02 12:42:57 -0400 |
| commit | 9df8a6eb9405dde4464d27133c04f5ee539a85de (patch) | |
| tree | 8a7ac5f52be8679f8a2525515a0b2c1b715c99ad /Git/Objects.hs | |
| parent | 16022a8b98f4bc134542e78a42538364d2f97d92 (diff) | |
| download | git-repair-9df8a6eb9405dde4464d27133c04f5ee539a85de.tar.gz | |
merge from git-annex and relicense accordingly
Merge git library and utility from git-annex. The former is now relicensed
AGPL, so git-repair as a whole becomes AGPL.
For simplicity, I am relicensing the remainder of the code in git-repair
AGPL as well, per the header changes in this commit. While that code is
also technically available under the GPL license, as it's been released
under that license before, changes going forward will be only released by
me under the AGPL.
Diffstat (limited to 'Git/Objects.hs')
| -rw-r--r-- | Git/Objects.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Git/Objects.hs b/Git/Objects.hs index bda220b..c9ede4d 100644 --- a/Git/Objects.hs +++ b/Git/Objects.hs @@ -2,7 +2,7 @@ - - Copyright 2013 Joey Hess <id@joeyh.name> - - - Licensed under the GNU GPL version 3 or higher. + - Licensed under the GNU AGPL version 3 or higher. -} module Git.Objects where @@ -12,7 +12,7 @@ import Git import Git.Sha objectsDir :: Repo -> FilePath -objectsDir r = localGitDir r </> "objects" +objectsDir r = fromRawFilePath (localGitDir r) </> "objects" packDir :: Repo -> FilePath packDir r = objectsDir r </> "pack" |