diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-08-04 08:10:35 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-08-04 08:10:35 -0700 |
| commit | dc87d078b4cc52296112b156811d2aae3d81f280 (patch) | |
| tree | 9f3abd5c85ae03de7a7cf1b2e05d3b819a7b8e7e | |
| parent | 67424f5bcac94ec3b37ac2f76d2c742adaa8e54c (diff) | |
| parent | 3bdd8974137d0348f599a9ba9d93f6ea9804e19a (diff) | |
| download | git-dc87d078b4cc52296112b156811d2aae3d81f280.tar.gz | |
Merge branch 'ms/meson-with-ancient-git-wo-ls-files-dedup'
Build fix.
* ms/meson-with-ancient-git-wo-ls-files-dedup:
meson: tolerate errors from git ls-files --deduplicate
| -rw-r--r-- | meson.build | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/meson.build b/meson.build index c043a79dca..5dd299b496 100644 --- a/meson.build +++ b/meson.build @@ -694,9 +694,14 @@ third_party_excludes = [ headers_to_check = [] if git.found() and fs.exists(meson.project_source_root() / '.git') - foreach header : run_command(git, '-C', meson.project_source_root(), 'ls-files', '--deduplicate', '*.h', third_party_excludes, check: true).stdout().split() - headers_to_check += header - endforeach + ls_headers = run_command(git, '-C', meson.project_source_root(), 'ls-files', '--deduplicate', '*.h', third_party_excludes, check: false) + if ls_headers.returncode() == 0 + foreach header : ls_headers.stdout().split() + headers_to_check += header + endforeach + else + warning('could not list headers, disabling static analysis targets') + endif endif if not get_option('breaking_changes') |