- Notifications
You must be signed in to change notification settings - Fork2.5k
conflict tests: checkcore.ignorecase#7026
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Uh oh!
There was an error while loading.Please reload this page.
Conversation
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.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others.Learn more.
| 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 arecase‐insensitive; this test would previously fail on acase‐sensitive APFS volume.
core.ignorecaseLooks like that works; let me know what you think! |
Thanks for the fix! |
1b348a3 intolibgit2:mainUh oh!
There was an error while loading.Please reload this page.
Thank you for the quick review and merge! 💜 |
Uh oh!
There was an error while loading.Please reload this page.
Not all filesystems on Apple and Windows platforms are case‐insensitive; this test would previously fail on a case‐sensitive APFS volume.