diff options
| author |  Joey Hess <joey@kitenet.net> | 2011-01-09 10:04:16 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2011-01-09 10:04:16 -0400 |
| commit | f4ddb580c83cba1c0e66fc5deb20bfc49ee4cf1b (patch) | |
| tree | 07181a244b4bde0f571db95c82d5ac823eb3905a | |
| parent | 51327c242f7087587884903632505552917b844a (diff) | |
bugfix: Fix crash caused by a symlink in the repo with link text ending in a "/". (Thanks Henrik for reporting.)
| -rw-r--r-- | Backend.hs | 3 | ||||
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | doc/bugs/problem_commit_normal_links.mdwn | 2 |
3 files changed, 8 insertions, 3 deletions
diff --git a/Backend.hs b/Backend.hs index 8142e4707..7e88ff304 100644 --- a/Backend.hs +++ b/Backend.hs @@ -130,7 +130,8 @@ lookupFile file = do getsymlink = do l <- readSymbolicLink file return $ takeFileName l - makekey bs l = + makekey _ [] = return Nothing + makekey bs l = do case maybeLookupBackendName bs bname of Nothing -> do unless (null kname || null bname) $ diff --git a/debian/changelog b/debian/changelog index 85878113e..2fd6d9d81 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,13 @@ -git-annex (0.17) UNRELEASED; urgency=low +git-annex (0.17) unstable; urgency=low * unannex: Now skips files whose content is not present, rather than it being an error. * New migrate subcommand can be used to switch files to using a different backend, safely and with no duplication of content. + * bugfix: Fix crash caused by a symlink in the repo with link text ending in + a "/". (Thanks Henrik for reporting.) - -- Joey Hess <joeyh@debian.org> Sat, 08 Jan 2011 13:45:06 -0400 + -- Joey Hess <joeyh@debian.org> Sun, 09 Jan 2011 10:04:11 -0400 git-annex (0.16) unstable; urgency=low diff --git a/doc/bugs/problem_commit_normal_links.mdwn b/doc/bugs/problem_commit_normal_links.mdwn index bc96ec938..11c9f7d8f 100644 --- a/doc/bugs/problem_commit_normal_links.mdwn +++ b/doc/bugs/problem_commit_normal_links.mdwn @@ -55,3 +55,5 @@ The trailing slash seems to make a difference! Best Regards, Henrik + +> Thanks for the bug report. This is fixed in 0.17. --[[Joey]] |