Commit 3f57f49
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -49,9 +49,18 @@ async function main() { | |||
| 49 | 49 | continue | |
| 50 | 50 | } | |
| 51 | 51 | ||
| 52 | - // Get diff from dev to PR head (PR's changes) | ||
| 52 | + // Find merge base and get diff from base to PR head (just the PR's changes) | ||
| 53 | + console.log(` Finding merge base for PR #${pr.number}...`) | ||
| 54 | + const mergeBaseResult = await $`git merge-base dev pr-${pr.number}`.nothrow() | ||
| 55 | + if (mergeBaseResult.exitCode !== 0 || !mergeBaseResult.stdout.trim()) { | ||
| 56 | + console.log(` Failed to find merge base for PR #${pr.number}`) | ||
| 57 | + skipped.push({ number: pr.number, reason: "Failed to find merge base" }) | ||
| 58 | + continue | ||
| 59 | + } | ||
| 60 | + const mergeBase = mergeBaseResult.stdout.trim() | ||
| 61 | + | ||
| 53 | 62 | console.log(` Getting diff for PR #${pr.number}...`) | |
| 54 | - const diff = await $`git diff dev..pr-${pr.number}`.nothrow() | ||
| 63 | + const diff = await $`git diff ${mergeBase}..pr-${pr.number}`.nothrow() | ||
| 55 | 64 | if (diff.exitCode !== 0) { | |
| 56 | 65 | console.log(` Failed to get diff for PR #${pr.number}`) | |
| 57 | 66 | console.log(` Error: ${diff.stderr}`) | |
0 commit comments