Skip to content

feat: support PR-URL with trailing slash #70

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

Merged
RafaelGSS merged 2 commits into from
Jul 16, 2024
Merged

feat: support PR-URL with trailing slash #70

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f5396e2
feat: support PR-URL with trailing slash
RafaelGSS Jul 16, 2024
29ecfe5
fixup! feat: support PR-URL with trailing slash
RafaelGSS Jul 16, 2024
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
8 changes: 8 additions & 0 deletions branch-diff.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,19 @@ async function findMergeBase (repoPath, branch1, branch2) {
return data.substr(0, 10)
}

function normalizeIfTrailingSlash (commit) {
if (commit.prUrl.at(-1) === '/') {
commit.prUrl = commit.prUrl.slice(0, -1)
}
}

async function diffCollected (options, branchCommits) {
function isInList (commit) {
normalizeIfTrailingSlash(commit)
return branchCommits[0].some((c) => {
if (commit.sha === c.sha) { return true }
if (commit.summary === c.summary) {
normalizeIfTrailingSlash(c)
if (commit.prUrl && c.prUrl) {
return commit.prUrl === c.prUrl
} else if (commit.author.name === c.author.name &&
Expand Down