diff: use overlays from previous version instead of using same overlays#575
Merged
paulRbr merged 1 commit intobump-sh:mainfrom Jan 13, 2026
Merged
diff: use overlays from previous version instead of using same overlays#575paulRbr merged 1 commit intobump-sh:mainfrom
paulRbr merged 1 commit intobump-sh:mainfrom
Conversation
paulRbr
force-pushed
the
diff-overlays
branch
from
65618ec to
02160f0
Compare
paulRbr
force-pushed
the
diff-overlays
branch
3 times, most recently
from
871b63b to
41557d5
Compare
This commit adapts the diff to be able to read the overlays of the _previous_ version (the one that we take from git on the base branch). We then have two list of overlay files (the previous overlay files and the current overlay files), materialized with the new variables `overlays1` and `overlays2`. We then pass this to the core diff function (which is modified in bump-sh/cli#776 and thus needs the action to update the bump-cli package to include that change).
paulRbr
force-pushed
the
diff-overlays
branch
from
41557d5 to
41a5030
Compare
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
2 participants
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.
This commit adapts the diff to be able to read the overlays of the
previous version (the one that we take from git on the base
branch). We then have two list of overlay files (the previous overlay
files and the current overlay files), materialized with the new
variables
overlays1andoverlays2.We then pass this to the core diff function (which is modified in
bump-sh/cli#776 and thus needs the action to
update the bump-cli package to include that change).