Skip to content

etc-merge: Minor refactor - #2656

Merged
ckyrouac merged 1 commit into
bootc-dev:mainfrom
Johan-Liebert1:etc-merge-followup
Nov 16, 2026
Merged

ckyrouac merged 1 commit into
bootc-dev:mainfrom
Johan-Liebert1:etc-merge-followup

Conversation

@Johan-Liebert1

Copy link
Copy Markdown
Member

Refactor out a chunk of code from get_modifications with no change in logic

Followup to #2650

Refactor out a chunk of code from `get_modifications` with no change in
logic

Followup to bootc-dev#2650

Signed-off-by: Pragyan Poudyal <pragyanpoudyal41999@gmail.com>
Copilot AI balanced review requested due to automatic review settings November 16, 2026 08:41
@bootc-bot
bootc-bot Bot requested a review from gursewak1997 November 16, 2026 08:41

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

🟢 Approval recommended

No active review issues are blocking the leaf-comparison refactor.

No open issues 🎉

What changed in this PR

This PR simplifies /etc change detection by extracting leaf comparison logic from get_modifications, following the fs-verity fix in #2650 without changing behavior.

Changes:

  • Extracts regular-file and symlink comparisons into check_leaf_modification.
  • Preserves metadata, content-hash, and fs-verity checks while simplifying the caller.
File Description
crates/​etc-merge/​src/​lib.rs Extracts leaf modification detection into a helper and replaces the inline logic with a call.

Review effort: Balanced

@ckyrouac
ckyrouac merged commit 0aee067 into bootc-dev:main Nov 16, 2026
59 checks passed
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.

3 participants