diff: change core run signature to allow TWO overlays list #776
Conversation
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
Indeed when diffing two files, it's also possible to have two differnet list of overlays (when we modify overlays). This commit thus changes the `overlays` parameter to `overlays1` and adds a new optional `overlays2` parameter to the `Diff#run` exported core function.
paulRbr
added a commit
to paulRbr/github-action
that referenced
this pull request
Jan 13, 2026
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).
Member
Author
|
ℹ️ note for reviewer: I've enabled auto-merge as I'm confident about releasing this change. |
paulRbr
added a commit
to paulRbr/github-action
that referenced
this pull request
Jan 13, 2026
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
added a commit
to paulRbr/github-action
that referenced
this pull request
Jan 13, 2026
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
added a commit
to paulRbr/github-action
that referenced
this pull request
Jan 13, 2026
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
added a commit
to paulRbr/github-action
that referenced
this pull request
Jan 13, 2026
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
added a commit
to paulRbr/github-action
that referenced
this pull request
Jan 13, 2026
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
added a commit
to bump-sh/github-action
that referenced
this pull request
Jan 13, 2026
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).
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.
Indeed when diffing two files, it's also possible to have two
differnet list of overlays (when we modify overlays).
This commit thus changes the
overlaysparameter tooverlays1andadds a new optional
overlays2parameter to theDiff#runexportedcore function.