Merge pull request #872 from koordinates/fix-lfs-config-for-tiffs

Fix LFS config for TIFFs, improve tests

kart/repo.py

@@ -443,8 +443,7 @@ def write_config(
         if spatial_filter_spec:
             spatial_filter_spec.write_config(self)
 
-        if not self.get_config_str("filter.lfs.process"):
-            self.write_lfs_filter_config()
+        self.write_lfs_filter_config()
 
     def write_lfs_filter_config(self):
         # TODO - try to bundle this config with the bundled Git, instead of once per repo.
@@ -465,6 +464,10 @@ def write_attributes(self):
             f.write("**/.*-dataset*/tile/** filter=lfs diff=lfs merge=lfs -text\n")
             f.write("*.laz filter=lfs diff=lfs merge=lfs -text\n")
             f.write("*.las filter=lfs diff=lfs merge=lfs -text\n")
+            f.write("*.tif filter=lfs diff=lfs merge=lfs -text\n")
+            f.write("*.tiff filter=lfs diff=lfs merge=lfs -text\n")
+            f.write("*.tif.aux.xml filter=lfs diff=lfs merge=lfs -text\n")
+            f.write("*.tiff.aux.xml filter=lfs diff=lfs merge=lfs -text\n")
 
         # Files potentially in workdir that should not be checked in:
         with (info_path / "exclude").open("a+") as f:

tests/conftest.py

@@ -1227,6 +1227,11 @@ def _check_lfs_hashes(repo, expected_file_count=None):
             file_hash, size = get_hash_and_size_of_file(file)
             assert file_hash == file.name
 
+            odb_hash = pygit2.hashfile(file)
+            assert (
+                odb_hash not in repo
+            ), f"Tile sha256:{file_hash} aka {odb_hash} should not be in ODB"
+
         if expected_file_count is not None:
             assert file_count == expected_file_count