From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 3 Mar 2025 16:53:02 +0000 (-0800)
Subject: Merge branch 'ps/meson-contrib-bits'
X-Git-Tag: v2.49.0-rc1~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ca39da6997dbc4eb295219d7764fd68ecd80361e;p=thirdparty%2Fgit.git

Merge branch 'ps/meson-contrib-bits'

Update meson-based build procedure to cover contrib/ and other
places as well.

* 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
---

ca39da6997dbc4eb295219d7764fd68ecd80361e
diff --cc .gitlab-ci.yml
index 86996fe941,bb7d0c9ef1..ab2cbb4534
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@@ -164,7 -164,7 +164,7 @@@ build:msvc-meson
    extends: .msvc-meson
    stage: build
    script:
-     - meson setup build -Dperl=disabled -Dbackend_max_links=1
 -    - meson setup build -Dperl=disabled -Dcredential_helpers=wincred
++    - meson setup build -Dperl=disabled -Dbackend_max_links=1 -Dcredential_helpers=wincred
      - meson compile -C build
    artifacts:
      paths: