diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-04-15 13:50:16 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-04-15 13:50:17 -0700 |
| commit | 7b03646f85b6eb4c0f6e05ed4b235577d3969532 (patch) | |
| tree | c3daadeb7eeaf85c3dbd10b85d776f93347ce969 /detect-compiler | |
| parent | a8c207797f2fe624c4959487e3508dde96f68976 (diff) | |
| parent | abd4192b07c5a7dbb4b13a532d0643982b42526f (diff) | |
| download | git-7b03646f85b6eb4c0f6e05ed4b235577d3969532.tar.gz | |
Merge branch 'js/comma-semicolon-confusion'
Code clean-up.
* js/comma-semicolon-confusion:
detect-compiler: detect clang even if it found CUDA
clang: warn when the comma operator is used
compat/regex: explicitly mark intentional use of the comma operator
wildmatch: avoid using of the comma operator
diff-delta: avoid using the comma operator
xdiff: avoid using the comma operator unnecessarily
clar: avoid using the comma operator unnecessarily
kwset: avoid using the comma operator unnecessarily
rebase: avoid using the comma operator unnecessarily
remote-curl: avoid using the comma operator unnecessarily
Diffstat (limited to 'detect-compiler')
| -rwxr-xr-x | detect-compiler | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/detect-compiler b/detect-compiler index a87650b71b..124ebdd4c9 100755 --- a/detect-compiler +++ b/detect-compiler @@ -9,7 +9,7 @@ CC="$*" # # FreeBSD clang version 3.4.1 (tags/RELEASE...) get_version_line() { - LANG=C LC_ALL=C $CC -v 2>&1 | grep ' version ' + LANG=C LC_ALL=C $CC -v 2>&1 | sed -n '/ version /{p;q;}' } get_family() { |
