summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Annex/Init.hs2
-rw-r--r--debian/changelog2
2 files changed, 3 insertions, 1 deletions
diff --git a/Annex/Init.hs b/Annex/Init.hs
index 6947ea119..24c5e18b1 100644
--- a/Annex/Init.hs
+++ b/Annex/Init.hs
@@ -44,7 +44,7 @@ import Annex.Perms
genDescription :: Maybe String -> Annex String
genDescription (Just d) = return d
genDescription Nothing = do
- reldir <- liftIO . relHome =<< fromRepo Git.repoPath
+ reldir <- liftIO . relHome =<< liftIO . absPath =<< fromRepo Git.repoPath
hostname <- fromMaybe "" <$> liftIO getHostname
#ifndef mingw32_HOST_OS
let at = if null hostname then "" else "@"
diff --git a/debian/changelog b/debian/changelog
index fc23d900d..0e028afc2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,8 @@ git-annex (5.20150114) UNRELEASED; urgency=medium
* addurl: When a Content-Disposition header suggests a filename to use,
addurl will consider using it, if it's reasonable and doesn't conflict
with an existing file. (--file overrides this)
+ * Fix default repository description created by git annex init,
+ which got broken by the relative path changes in the last release.
-- Joey Hess <id@joeyh.name> Tue, 13 Jan 2015 17:03:39 -0400