Merge bitcoin/bitcoin#34551: ci: Extend diff context for clang-format

f8d2f30bf3 ci: Extend diff context for clang-format (Hennadii Stepanov)

Pull request description:

  This PR ensures `clang-format` can properly restore empty lines between header groups that were previously stripped by `fix_includes.py`.

  Addresses [this](https://github.com/bitcoin/bitcoin/pull/34448#issuecomment-3876394168) comment.

ACKs for top commit:
  maflcko:
    lgtm ACK f8d2f30bf3
  l0rinc:
    untested code review ACK f8d2f30bf3
  sedited:
    ACK f8d2f30bf3

Tree-SHA512: 97e5450fc15e415134aa1e74ee415f947173978d999afbc0f204e1cdb2f68309b763c8a2ad819c4597147fc15540600aa8c99477db64e961ad428d8f45f3d384
This commit is contained in:
merge-script
2026-02-11 10:02:59 +01:00

View File

@@ -198,7 +198,7 @@ if [[ "${RUN_IWYU}" == true ]]; then
-Xiwyu --check_also="*/primitives/*.h" \
2>&1 | tee /tmp/iwyu_ci.out
python3 "/include-what-you-use/fix_includes.py" --nosafe_headers < /tmp/iwyu_ci.out
git diff -U0 | ./contrib/devtools/clang-format-diff.py -binary="clang-format-${TIDY_LLVM_V}" -p1 -i -v
git diff -U1 | ./contrib/devtools/clang-format-diff.py -binary="clang-format-${TIDY_LLVM_V}" -p1 -i -v
}
run_iwyu "compile_commands_iwyu_errors.json"