]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'ps/build-tweaks' into rs/use-strvec-pushv
authorJunio C Hamano <gitster@pobox.com>
Tue, 24 Mar 2026 19:25:21 +0000 (12:25 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 24 Mar 2026 19:25:21 +0000 (12:25 -0700)
The topic moves the coccinelle rules from contrib/ to tools/
directory, breaking merges with this topic.

* ps/build-tweaks:
  meson: precompile "git-compat-util.h"
  meson: compile compatibility sources separately
  git-compat-util.h: move warning infra to prepare for PCHs
  builds: move build scripts into "tools/"
  contrib: move "update-unicode.sh" script into "tools/"
  contrib: move "coverage-diff.sh" script into "tools/"
  contrib: move "coccinelle/" directory into "tools/"
  Introduce new "tools/" directory

1  2 
Makefile
meson.build

diff --cc Makefile
Simple merge
diff --cc meson.build
index 9e9ba9b82b80eac305f92a9baf844303993affad,2002f4795eb2ab1c7fb29db30952e8b1b943733b..11488623bfd8f8303cb3e870d700b2072cffffdb
@@@ -1438,9 -1429,9 +1441,9 @@@ els
      'getpagesize' : [],
    }
  
 -  if get_option('b_sanitize').contains('address')
 +  if get_option('b_sanitize').contains('address') or get_option('b_sanitize').contains('leak')
      libgit_c_args += '-DNO_MMAP'
-     libgit_sources += 'compat/mmap.c'
+     compat_sources += 'compat/mmap.c'
    else
      checkfuncs += { 'mmap': ['mmap.c'] }
    endif