diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-01-15 16:43:44 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-01-15 16:43:44 -0400 |
| commit | 1dc9fa4bbdb61207445df7c890b3573bbb16a66c (patch) | |
| tree | 199d7f9b618ee25926aebd6728bedd894619061e | |
| parent | 93607362fbb32d9804f61207678a2279ed059424 (diff) | |
webapp: Fix crash adding removable drive that has an annex directory in it that is not a git repository.
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | doc/bugs/Internal_server_error_adding_USB_drive_on_OS_X.mdwn | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 351ad3f88..652752fd0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,8 @@ git-annex (3.20130115) UNRELEASED; urgency=low Closes: #698184 * webapp: Now always logs to .git/annex/daemon.log * webapp: Has a page to view the log, accessed from the control menu. + * webapp: Fix crash adding removable drive that has an annex directory + in it that is not a git repository. -- Joey Hess <joeyh@debian.org> Mon, 14 Jan 2013 18:35:01 -0400 diff --git a/doc/bugs/Internal_server_error_adding_USB_drive_on_OS_X.mdwn b/doc/bugs/Internal_server_error_adding_USB_drive_on_OS_X.mdwn index c2fbc98fa..575a63684 100644 --- a/doc/bugs/Internal_server_error_adding_USB_drive_on_OS_X.mdwn +++ b/doc/bugs/Internal_server_error_adding_USB_drive_on_OS_X.mdwn @@ -19,3 +19,7 @@ git-annex version 3.20130107, OS X Mountain Lion. No MacPorts/homebrew/fink inst Please provide any additional information below. Maybe something to do with the drive name having spaces? "/Volumes/git-annex" worked fine. + +> Good thought in the comment. I was able to reproduce the failure +> if the removable drive already had an "annex" directory that was not +> a git repo. I've made it handle this case. [[done]] --[[Joey]] |