aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2026-04-01 10:28:19 -0700
committerJunio C Hamano <gitster@pobox.com>2026-04-01 10:28:19 -0700
commit0f85c4c100fb9c72a638c2b2f360e5f9819831a1 (patch)
tree5ca0b328aec0c37dee03816c39d0b3bf2b92bfb2
parent51a74900aa48242db54336c0af43507acbe108ed (diff)
parentbd66ed316c868aacdb6b5e3a21751c5bab3a4f31 (diff)
downloadgit-0f85c4c100fb9c72a638c2b2f360e5f9819831a1.tar.xz
Merge branch 'jc/macos-homebrew-wo-reg-enhanced'
In case homebrew breaks REG_ENHANCED again, leave a in-code comment to suggest use of our replacement regex as a workaround. * jc/macos-homebrew-wo-reg-enhanced: regexp: leave a pointer to resurrect workaround for Homebrew
-rw-r--r--compat/regcomp_enhanced.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/compat/regcomp_enhanced.c b/compat/regcomp_enhanced.c
index 84193ce53b..29c74eee99 100644
--- a/compat/regcomp_enhanced.c
+++ b/compat/regcomp_enhanced.c
@@ -3,6 +3,11 @@
int git_regcomp(regex_t *preg, const char *pattern, int cflags)
{
+ /*
+ * If you are on macOS with clang and fail to compile this line,
+ * https://lore.kernel.org/git/458ad3c1-96df-4575-ee42-e6eb754f25f6@gmx.de/
+ * might be relevant.
+ */
if (!(cflags & REG_EXTENDED))
cflags |= REG_ENHANCED;
return regcomp(preg, pattern, cflags);