Merge branch 'master' into v8

This commit is contained in:
Joey Hess 2020-02-19 14:32:11 -04:00
commit 029c883713
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
456 changed files with 6341 additions and 1085 deletions

View file

@ -145,6 +145,7 @@ remaining todo:
> Use scanUnlockedFiles to repopulate the Associated table.
>
> But that does not repopulate the Content table. Doing so needs
<<<<<<< HEAD
> to iterate over the unlocked files, filter out any that are modified,
> and record the InodeCaches of the unmodified ones. Seems that it would
> have to use git's index to know which files are modified.