tree 409a88ba0a285b0f7d0903e7817b7f973f5a8789
parent 6f8a48134cae23ac380f6704a46ceebac64d7f12
parent b3da1fbab93d63a594b6c743f9a7c98ecc768022
author Matthias Sohn <matthias.sohn@sap.com> 1733443160 +0100
committer Matthias Sohn <matthias.sohn@sap.com> 1733443279 +0100

Merge branch 'stable-7.0' into stable-7.1

* stable-7.0:
  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: Icb25fed5b703c6a39a64231fd8ca93c1f1a581be