diff options
| author |  Joey Hess <joey@kitenet.net> | 2010-12-02 21:07:16 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2010-12-02 21:07:16 -0400 |
| commit | 83a87a522903e18a16ae19e1b741ab4e1f2b95a6 (patch) | |
| tree | a46a7958bbd7ec444f0eb60310199f82cfff4b03 | |
| parent | d1b5ef9565cfc5991a473985a36fe00c9384ece5 (diff) | |
Improve detection of version 0 repos.
| -rw-r--r-- | Version.hs | 6 | ||||
| -rw-r--r-- | debian/changelog | 1 |
2 files changed, 5 insertions, 2 deletions
diff --git a/Version.hs b/Version.hs index 839470120..fc1ce3d7e 100644 --- a/Version.hs +++ b/Version.hs @@ -29,9 +29,11 @@ getVersion = do then return $ Just v else do -- version 0 was not recorded in .git/config; - -- such a repo should have an annexDir + -- such a repo should have an annexDir but no + -- annexObjectDir d <- liftIO $ doesDirectoryExist $ annexDir g - if d + o <- liftIO $ doesDirectoryExist $ annexObjectDir g + if d && not o then return $ Just "0" else return Nothing -- no version yet diff --git a/debian/changelog b/debian/changelog index fb2d2aae2..9e378400c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ git-annex (0.11) UNRELEASED; urgency=low repositories. This allows resuming interrupted transfers. * Added remote.annex-rsync-options. * Avoid deleting temp files when rsync fails. + * Improve detection of version 0 repos. -- Joey Hess <joeyh@debian.org> Thu, 02 Dec 2010 16:54:12 -0400 |