]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'ps/meson-contrib-bits' into tz/doc-txt-to-adoc-fixes
authorJunio C Hamano <gitster@pobox.com>
Sat, 1 Mar 2025 18:00:45 +0000 (10:00 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sat, 1 Mar 2025 18:00:45 +0000 (10:00 -0800)
* ps/meson-contrib-bits:
  ci: exercise credential helpers
  ci: fix propagating UTF-8 test locale in musl-based Meson job
  meson: wire up static analysis via Coccinelle
  meson: wire up git-contacts(1)
  meson: wire up credential helpers
  contrib/credential: fix compilation of "osxkeychain" helper
  contrib/credential: fix compiling "libsecret" helper
  contrib/credential: fix compilation of wincred helper with MSVC
  contrib/credential: fix "netrc" tests with out-of-tree builds
  GIT-BUILD-OPTIONS: propagate project's source directory

1  2 
Makefile
meson.build

diff --cc Makefile
Simple merge
diff --cc meson.build
Simple merge