2
0
Эх сурвалжийг харах

Fix LFS compat tests on Windows by disabling autocrlf

On Windows, git-lfs creates .gitattributes with CRLF line endings.
When autocrlf is enabled (Windows default), this causes .gitattributes
to appear as modified in status checks due to line ending differences.
Jelmer Vernooij 3 сар өмнө
parent
commit
55c0a27531

+ 6 - 0
tests/compat/test_lfs.py

@@ -337,6 +337,8 @@ class LFSStatusCompatTest(LFSCompatTestCase):
         """
         """
         repo_dir = self.make_temp_dir()
         repo_dir = self.make_temp_dir()
         run_git_or_fail(["init"], cwd=repo_dir)
         run_git_or_fail(["init"], cwd=repo_dir)
+        # Disable autocrlf to avoid line ending issues on Windows
+        run_git_or_fail(["config", "core.autocrlf", "false"], cwd=repo_dir)
         run_git_or_fail(["lfs", "install", "--local"], cwd=repo_dir)
         run_git_or_fail(["lfs", "install", "--local"], cwd=repo_dir)
         run_git_or_fail(["lfs", "track", "*.bin"], cwd=repo_dir)
         run_git_or_fail(["lfs", "track", "*.bin"], cwd=repo_dir)
         run_git_or_fail(["add", ".gitattributes"], cwd=repo_dir)
         run_git_or_fail(["add", ".gitattributes"], cwd=repo_dir)
@@ -369,6 +371,8 @@ class LFSStatusCompatTest(LFSCompatTestCase):
         """Test git status with modified LFS files."""
         """Test git status with modified LFS files."""
         repo_dir = self.make_temp_dir()
         repo_dir = self.make_temp_dir()
         run_git_or_fail(["init"], cwd=repo_dir)
         run_git_or_fail(["init"], cwd=repo_dir)
+        # Disable autocrlf to avoid line ending issues on Windows
+        run_git_or_fail(["config", "core.autocrlf", "false"], cwd=repo_dir)
         run_git_or_fail(["lfs", "install", "--local"], cwd=repo_dir)
         run_git_or_fail(["lfs", "install", "--local"], cwd=repo_dir)
         run_git_or_fail(["lfs", "track", "*.bin"], cwd=repo_dir)
         run_git_or_fail(["lfs", "track", "*.bin"], cwd=repo_dir)
         run_git_or_fail(["add", ".gitattributes"], cwd=repo_dir)
         run_git_or_fail(["add", ".gitattributes"], cwd=repo_dir)
@@ -398,6 +402,8 @@ class LFSStatusCompatTest(LFSCompatTestCase):
         """Test git status with multiple LFS files."""
         """Test git status with multiple LFS files."""
         repo_dir = self.make_temp_dir()
         repo_dir = self.make_temp_dir()
         run_git_or_fail(["init"], cwd=repo_dir)
         run_git_or_fail(["init"], cwd=repo_dir)
+        # Disable autocrlf to avoid line ending issues on Windows
+        run_git_or_fail(["config", "core.autocrlf", "false"], cwd=repo_dir)
         run_git_or_fail(["lfs", "install", "--local"], cwd=repo_dir)
         run_git_or_fail(["lfs", "install", "--local"], cwd=repo_dir)
         run_git_or_fail(["lfs", "track", "*.bin"], cwd=repo_dir)
         run_git_or_fail(["lfs", "track", "*.bin"], cwd=repo_dir)
         run_git_or_fail(["add", ".gitattributes"], cwd=repo_dir)
         run_git_or_fail(["add", ".gitattributes"], cwd=repo_dir)