summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Command/Unused.hs9
-rw-r--r--debian/changelog1
2 files changed, 7 insertions, 3 deletions
diff --git a/Command/Unused.hs b/Command/Unused.hs
index b115eee83..09b4be5df 100644
--- a/Command/Unused.hs
+++ b/Command/Unused.hs
@@ -229,9 +229,12 @@ withKeysReferencedM a = withKeysReferenced' () calla
withKeysReferenced' :: v -> (Key -> v -> Annex v) -> Annex v
withKeysReferenced' initial a = go initial =<< files
where
- files = do
- top <- fromRepo Git.repoPath
- inRepo $ LsFiles.inRepo [top]
+ files = ifM isBareRepo
+ ( return []
+ , do
+ top <- fromRepo Git.repoPath
+ inRepo $ LsFiles.inRepo [top]
+ )
go v [] = return v
go v (f:fs) = do
x <- Backend.lookupFile f
diff --git a/debian/changelog b/debian/changelog
index 82bf5009a..9b2ff3f14 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ git-annex (3.20120722) UNRELEASED; urgency=low
* initremote: Avoid recording remote's description before checking
that its config is valid.
+ * unused, status: Avoid crashing when ran in bare repo.
-- Joey Hess <joeyh@debian.org> Fri, 27 Jul 2012 21:04:47 -0400