summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-08-05 15:01:26 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-08-05 15:01:26 -0400
commitb885c0c6c8faa0c56e5f8cbdaa031652df6b26b4 (patch)
tree739dea0e4da82a56135e3fe1240168960fcc3935
parent39c2f1ed04cdd43f26391d1db5d89ae27b1c8cc1 (diff)
unused, status: Avoid crashing when ran in bare repo.
-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