From 68bdccc69fba82760ddaa10edbbdbc4d228fe2be Mon Sep 17 00:00:00 2001 From: Eliah Kagan Date: Sat, 1 Mar 2025 20:09:23 -0500 Subject: [PATCH] Fix Windows-related `-c` options in `match_baseline_files` The `match_baseline_files.sh` fixture script adds entries to the index using `git update-index --add --cacheinfo`. These entries don't exist on disk, so it should be okay that some would cause problems on Windows if an attempt were made to actually create them. The tests that use the generated repository work on Windows. It is intended that the fixture script also be able to run on Windows, and Windows-related `-c` options are passed in commands where they are expected to be needed: `core.ignoreCase=false` and `core.protectNTFS=false`. But the fixture script nonetheless was failing on Windows because two commands that don't need `core.ignoreCase=false` but *do* need `core.protectNTFS=false` had `core.ignorecase=false` instead. This corrects that. This fixes two of the long-standing `GIX_TEST_IGNORE_ARCHIVES=1` Windows failures reported in #1358: - gix-pathspec::pathspec search::files - gix-pathspec::pathspec search::prefixes_are_always_case_sensitive --- ...ndows-expected-failures-see-issue-1358.txt | 2 -- .../match_baseline_files.tar | Bin 72704 -> 72192 bytes .../tests/fixtures/match_baseline_files.sh | 4 ++-- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/etc/test-fixtures-windows-expected-failures-see-issue-1358.txt b/etc/test-fixtures-windows-expected-failures-see-issue-1358.txt index 945b94e97b2..661282f3a94 100644 --- a/etc/test-fixtures-windows-expected-failures-see-issue-1358.txt +++ b/etc/test-fixtures-windows-expected-failures-see-issue-1358.txt @@ -2,8 +2,6 @@ gix-glob::glob pattern::matching::compare_baseline_with_ours gix-pathspec::pathspec parse::baseline gix-pathspec::pathspec parse::valid::glob_negations_are_always_literal gix-pathspec::pathspec parse::valid::whitespace_in_pathspec -gix-pathspec::pathspec search::files -gix-pathspec::pathspec search::prefixes_are_always_case_sensitive gix-submodule::submodule file::baseline::common_values_and_names_by_path gix-submodule::submodule file::is_active_platform::pathspecs_matter_even_if_they_do_not_match gix-submodule::submodule file::is_active_platform::submodules_with_active_config_are_considered_active_or_inactive diff --git a/gix-pathspec/tests/fixtures/generated-archives/match_baseline_files.tar b/gix-pathspec/tests/fixtures/generated-archives/match_baseline_files.tar index 11e44ce55e5276ed7a89032e37311825aaff16e1..b9aafc518d720ea4eca3da32f469ccf406c165b9 100644 GIT binary patch delta 376 zcmZqJ!P2mWWdYMNAx4%(KX?{>VcN#R$j`!Tp=Y?+@zQ?Ai3BP^D-+o2VPnalyh3d#Iooc(>6Xv7M9H{Y>Z5cS@~Etv+8g#E#|dgTg>YM#AZyJ zdG#2XHuKs2XWh)}^@DXWs{z|$)+a!90c=c*xiiEzb8lkd*v!A=5A$a3Iu?=5{8#=k zFXo=XvzhzOFXqjxli1icb01<6+RVS=Kj&t?pueJvxp#4F=DzWZc`+*o&?pU-#jFp2 z#tGeLl1M+iUO=Ep)m2?LS--uZn-z$Fs4tWn$-i^~0M#J(pnG%=O_n T<6_oVY@1o7e)BF9V`KvW47z`O delta 409 zcmZqJ!qTvVWdYM7IhIWttW1kppRp}w)neJq`sF^8L|SY{0cVKJSs2a0z`@ACe}!xF zpKlMCamjK_w)w3(S@JhGE(PpB1qQezg~7U4{x%gk(#4)Nw{Ba_>>pc2JpRZk_2`KC zZ~w%~$j7(o4J*)rdK^rfdF>dPHuL#>XWh(d!@;ze*MMy?uLBU9v2Esc`vDXUV`Ey( zeMD?AcZAqx?kX0M&HRi0urB7F#Iu;YjAb+TE@rOHe0hul)oS|pH zYHDoGU^>}RAZ0TnGZW)xW}&}~i paths