conflict tests: check core.ignorecase
#7026
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ethomson
reviewed
Jan 21, 2025
tests/libgit2/checkout/conflict.c
Outdated
| @@ -947,6 +949,8 @@ void test_checkout_conflict__name_mangled_file_exists_in_workdir(void) | |||
| cl_git_rewritefile("merge-resolve/test-three.txt~THEIRS", | |||
| "Expect case insensitive filesystems to create ~theirs_0"); | |||
|
|
|||
| case_insensitive_fs = git_fs_path_exists("merge-resolve/test-three.txt~ours"); | |||
There was a problem hiding this comment.
Suggested change
| case_insensitive_fs = git_fs_path_exists("merge-resolve/test-three.txt~ours"); | |
| case_insensitive_fs = cl_repo_get_bool(g_repo, "core.ignorecase"); |
|
Thanks! An embarrassing oversight that I think that I introduced. Now we have a simple one-liner to query the repo's configuration, so I wonder if checking |
Not all filesystems on Apple and Windows platforms are case‐insensitive; this test would previously fail on a case‐sensitive APFS volume.
6f4141a to
96bdc04
Compare
core.ignorecase
|
Looks like that works; let me know what you think! |
|
Thanks for the fix! |
|
Thank you for the quick review and merge! 💜 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Not all filesystems on Apple and Windows platforms are case‐insensitive; this test would previously fail on a case‐sensitive APFS volume.