prep for fixing find --branch --unlocked

Added LinkType to ProvidedInfo, and unified MatchingKey with
ProvidedInfo. They're both used in the same way, so there was no real
reason to keep separate.

Note that addLocked and addUnlocked still set matchNeedsFileName,
because to handle MatchingFile, they do need it. However, they
don't use it when MatchingInfo is provided. This should be ok,
the --branch case will be able skip checking matchNeedsFileName,
since it will provide a filename in any case.

Command/Export.hs

@@ -491,11 +491,17 @@ filterPreferredContent r tree = logExportExcluded (uuid r) $ \logwriter -> do
 	checkmatcher matcher logwriter ti@(Git.Tree.TreeItem topf _ sha) =
 		catKey sha >>= \case
 			Just k -> do
-				-- Match filename relative to the
-				-- top of the tree.
-				let af = AssociatedFile $ Just $
-					getTopFilePath topf
-				let mi = MatchingKey k af
+				let mi = MatchingInfo $ ProvidedInfo
+					{ providedFilePath = Just $
+						-- Match filename relative
+						-- to the top of the tree.
+						getTopFilePath topf
+					, providedKey = Just k
+					, providedFileSize = Nothing
+					, providedMimeType = Nothing
+					, providedMimeEncoding = Nothing
+					, providedLinkType = Nothing
+					}
 				ifM (checkMatcher' matcher mi mempty)
 					( return (Just ti)
 					, do