Repository navigation
etc-merge: Minor refactor - #2656
Merged
Merged
Conversation
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>
There was a problem hiding this comment.
🟢 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
approved these changes
Nov 16, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Refactor out a chunk of code from
get_modificationswith no change in logicFollowup to #2650