admin/git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

meson: tolerate errors from git ls-files --deduplicate

Browse Source 
When using the Meson build system with versions of Git before 2.31,
that does not yet know the `git ls-files --deduplicate` option, one
can observe the following error:

    ../meson.build:697:19: ERROR: Command `/usr/bin/git -C /home/martin/code/git ls-files --deduplicate '*.h' ':!contrib' ':!compat/inet_ntop.c' ':!compat/inet_pton.c' ':!compat/nedmalloc' ':!compat/obstack.*' ':!compat/poll' ':!compat/regex' ':!sha1collisiondetection' ':!sha1dc' ':!t/unit-tests/clar' ':!t/t[0-9][0-9][0-9][0-9]*' ':!xdiff'` failed with status 129.

The failing command is used to find all header files in our code
base, which is required for static analysis.

Static analysis is an entirely optional feature that distributors
typically don't care about, and we already know to skip running the
command when we are not in a Git repository. But we do not handle
the above failure gracefully, even though we could.

Fix this by passing `check: false` to `run_command`, which makes it
tolerate failures. Then check `returncode()` manually to decide
whether to inspect the output.

Signed-off-by: Martin Storsjö <martin@martin.st>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Martin Storsjö
2025-08-01 19:28:14 +03:00
committed by Junio C Hamano
parent f368df439b
commit 3bdd897413
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
meson.build
View File

@@ -694,9 +694,14 @@ third_party_excludes = [
headers_to_check = [] headers_to_check = []
if git.found() and fs.exists(meson.project_source_root() / '.git') 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() ls_headers = run_command(git, '-C', meson.project_source_root(), 'ls-files', '--deduplicate', '*.h', third_party_excludes, check: false)
headers_to_check += header if ls_headers.returncode() == 0
endforeach foreach header : ls_headers.stdout().split()
headers_to_check += header
endforeach
else
warning('could not list headers, disabling static analysis targets')
endif
endif endif
if not get_option('breaking_changes') if not get_option('breaking_changes')