Skip to content

style: restore upstream trailing whitespace - #51

Merged
lvaroqui merged 1 commit into
masterfrom
chore/restore-upstream-trailing-whitespace
Oct 13, 2026
Merged

lvaroqui merged 1 commit into
masterfrom
chore/restore-upstream-trailing-whitespace

Conversation

@lvaroqui

@lvaroqui lvaroqui commented Oct 12, 2026 •

Copy link
Copy Markdown
Contributor

Restore upstream's trailing whitespace on the 496 lines (10 files) where it was the only difference from upstream VALGRIND_3_26_0.

Earlier upstream merges (3.24.0 and 3.26.0) stripped it from upstream lines in configure.ac, NEWS, the syswrap and debuginfo sources, and the untouched parts of the callgrind files we modify. Any upstream edit next to one of those lines then conflicts at the next merge: in a trial merge of 3.27.1, 6 of the 7 conflict hunks were only this.

The change is whitespace-only: git diff --ignore-space-at-eol over the commit is empty, and every touched file now differs from VALGRIND_3_26_0 only by our real changes.

PS: yes this is so cursed 🤣

Refs COD-3818

Earlier upstream merges stripped trailing whitespace from upstream lines
in configure.ac, NEWS, the syswrap and debuginfo sources, and the
untouched parts of the callgrind files we modify. Every upstream edit
next to one of those lines then conflicts on the following merge. Take
upstream's bytes back for every line that only differed by trailing
whitespace.

Refs COD-3818
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@lvaroqui lvaroqui closed this Oct 12, 2026
@lvaroqui lvaroqui reopened this Oct 12, 2026
@lvaroqui
lvaroqui marked this pull request as ready for review October 12, 2026 13:56
@greptile-apps

greptile-apps Bot commented Oct 12, 2026 •

Copy link
Copy Markdown

RetriggerConfidence Score: 5/5

[Low impact] The PR appears safe to merge; no actionable defects were established.

Summary

Restores upstream trailing whitespace on 496 lines across 10 files to reduce conflicts in future upstream merges.

  • Upstream source lines keep their original trailing spaces.

Reviews (1) · Last reviewed commit: "style: restore upstream trailing whitesp..." · Reviewed by Greptile

@codspeed

codspeed Bot commented Oct 12, 2026

Copy link
Copy Markdown

Merging this PR will not alter performance

✅ 84 untouched benchmarks
⏩ 60 skipped benchmarks1


Comparing chore/restore-upstream-trailing-whitespace (a9fdff3) with master (47784c0)

Open in CodSpeed

Footnotes

  1. 60 benchmarks were skipped, so the baseline results were used instead. If they were deleted from the codebase, click here and archive them to remove them from the performance reports. ↩

@lvaroqui
lvaroqui requested a review from not-matthias October 12, 2026 14:17

@not-matthias not-matthias left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great work!! 🚀 🔥

@lvaroqui
lvaroqui merged commit e1e4bdf into master Oct 13, 2026
18 checks passed
@lvaroqui
lvaroqui deleted the chore/restore-upstream-trailing-whitespace branch October 13, 2026 13:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants