diff options
-rw-r--r-- | Config.hs | 2 | ||||
-rw-r--r-- | debian/changelog | 6 |
2 files changed, 7 insertions, 1 deletions
@@ -93,6 +93,6 @@ getTrustLevel r = fromRepo $ Git.Config.getMaybe $ remoteConfig r "trustlevel" {- Gets annex.diskreserve setting. -} getDiskReserve :: Annex Integer getDiskReserve = fromMaybe megabyte . readSize dataUnits - <$> getConfig "diskreserve" "" + <$> getConfig "annex.diskreserve" "" where megabyte = 1000000 diff --git a/debian/changelog b/debian/changelog index e63e82f0e..4520a0546 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +git-annex (3.20120419) UNRELEASED; urgency=low + + * Fix use of annex.diskreserve config setting. + + -- Joey Hess <joeyh@debian.org> Fri, 20 Apr 2012 16:14:08 -0400 + git-annex (3.20120418) unstable; urgency=low * bugfix: Adding a dotfile also caused all non-dotfiles to be added. |