fix: improve branch reference handling and compare with merged state #14
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 PR addresses an issue where the kustomize-diff action would fail when trying to create and merge temporary branches.
Problem
The action was attempting to compare BASE with the result of merging HEAD into BASE (which is the correct approach), but was failing with:
This occurred because:
Solution
Implemented robust branch reference resolution that:
This fix enables the action to correctly implement the "compare with merged state" approach as initially intended, ensuring accurate diffs are displayed in PR comments.
Checklist:
git commit -s