Skip to content

Commit

Permalink
[CI][format] Explicitly pass extensions to git-clang-format (#95794)
Browse files Browse the repository at this point in the history
This ensures that the CI script controls which file extensions are
considered instead of letting git-clang-format apply its own filtering
rules. In particular, this properly handles libc++ extension-less
headers which were passed to git-clang-format, but then dropped by that
tool as having an unrecognized extension.
  • Loading branch information
ldionne committed Jun 17, 2024
1 parent 7ddff3a commit 7620fe0
Showing 1 changed file with 11 additions and 0 deletions.
11 changes: 11 additions & 0 deletions llvm/utils/git/code-format-helper.py
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,17 @@ def format_run(self, changed_files: List[str], args: FormatArgs) -> Optional[str
cf_cmd.append(args.start_rev)
cf_cmd.append(args.end_rev)

# Gather the extension of all modified files and pass them explicitly to git-clang-format.
# This prevents git-clang-format from applying its own filtering rules on top of ours.
extensions = set()
for file in cpp_files:
_, ext = os.path.splitext(file)
extensions.add(
ext.strip(".")
) # Exclude periods since git-clang-format takes extensions without them
cf_cmd.append("--extensions")
cf_cmd.append("'{}'".format(",".join(extensions)))

cf_cmd.append("--")
cf_cmd += cpp_files

Expand Down

0 comments on commit 7620fe0

Please sign in to comment.