mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge remote-tracking branch 'origin/master' into assistant

Browse source 
Conflicts:
	Init.hs
This commit is contained in:
Joey Hess 2012-08-05 15:05:30 -04:00
commit 0833eb43a6
6 changed files with 64 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Command/Unused.hs
View file

@ -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