tree 6e3e35adfdfd9a3d606c8393ccf8359bfb247611
parent e3eabe5d5cc9bd4f43f18014cac70e80b55cb45b
parent 8c4a150164eee728bc6d290f9da2baa1808c1e75
author Matthias Sohn <matthias.sohn@sap.com> 1733442655 +0100
committer Matthias Sohn <matthias.sohn@sap.com> 1733442655 +0100

Merge branch 'stable-6.10' into stable-7.0

* stable-6.10:
  FileSnapshot: silence "Not a Directory" exceptions
  FileSnapshot: refactor to share error handling
  Mark Attribute#getValue as @Nullable
  Fix potential NPE in ResolveMerger#getAttributesContentMergeStrategy
  Fix NPE in DiffFormatter#getDiffDriver
  Pack: ensure packfile is still valid while still recoverable
  WindowCache: add bulk purge(), call from bulk sites
  UploadPack#implies: add missing @since tag
  Disable MergeToolTest#testEmptyToolName

Change-Id: I854f44e76b73ae434a0d6b6ab782fd0aed72f219