mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Fix default repository description created by git annex init, which got broken by the relative path changes in the last release.

Browse source
This commit is contained in:
Joey Hess 2015-01-22 14:59:57 -04:00
parent d1ac9904b8
commit f50b6779f9
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Annex/Init.hs
View file

@ -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 "@"

2
debian/changelog vendored
View file

@ -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