Skip to content

fix: use merge-base for accurate change detection in pj-rehearse #4869

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
deepsm007 wants to merge 1 commit into
base: main
Choose a base branch
from
+12 −1
Open

fix: use merge-base for accurate change detection in pj-rehearse #4869

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion pkg/config/release.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,18 @@ func getRevChanges(root, path, base string, ignoreModified bool) ([]string, erro
if ignoreModified {
filter = "--diff-filter=ACR"
}
cmd := []string{"diff-tree", "-r", filter, base + ":" + path, "HEAD:" + path}
// Find merge base to handle cases where base branch has moved forward.
// This ensures accurate change detection even when the PR was created from
// an outdated base branch commit.
mergeBase, err := git(root, "merge-base", base, "HEAD")
if err != nil {
// Fallback to original behavior if merge-base fails (e.g., no common ancestor)
// This can happen in edge cases, so we use the provided base directly
mergeBase = base
} else {
mergeBase = strings.TrimSpace(mergeBase)
}
cmd := []string{"diff-tree", "-r", filter, mergeBase + ":" + path, "HEAD:" + path}
diff, err := git(root, cmd...)
if err != nil || diff == "" {
return nil, err
Expand Down