]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'js/comma-semicolon-confusion'
authorJunio C Hamano <gitster@pobox.com>
Tue, 15 Apr 2025 20:50:16 +0000 (13:50 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 15 Apr 2025 20:50:17 +0000 (13:50 -0700)
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

1  2 
builtin/rebase.c
config.mak.dev
meson.build

Simple merge
diff --cc config.mak.dev
index 95b7bc46ae774cdea6219990505c7c8ec5a11899,31423638169a676fbb8c0c62e345461a4ffdb0e9..e86b6e1b34a2d7fbc59185f036591b16d259ac4a
@@@ -39,8 -39,11 +39,12 @@@ DEVELOPER_CFLAGS += -Wunuse
  DEVELOPER_CFLAGS += -Wvla
  DEVELOPER_CFLAGS += -Wwrite-strings
  DEVELOPER_CFLAGS += -fno-common
 +DEVELOPER_CFLAGS += -Wunreachable-code
  
+ ifneq ($(filter clang9,$(COMPILER_FEATURES)),)
+ DEVELOPER_CFLAGS += -Wcomma
+ endif
  ifneq ($(filter clang4,$(COMPILER_FEATURES)),)
  DEVELOPER_CFLAGS += -Wtautological-constant-out-of-range-compare
  endif
diff --cc meson.build
Simple merge