Merge remote-tracking branch 'origin/master' into assistant
Conflicts: Init.hs
This commit is contained in:
commit
0833eb43a6
6 changed files with 64 additions and 16 deletions
|
@ -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
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue