Skip to content

Commit 02eeef4

Browse files
committed
Fix undefined instead of ref in log output
1 parent 37a6d38 commit 02eeef4

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

dist/index.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3875,21 +3875,21 @@ async function getChangesSinceMergeBase(base, head, initialFetchDepth) {
38753875
return (await exec_1.default('git', ['merge-base', baseRef, headRef], { ignoreReturnCode: true })).code === 0;
38763876
}
38773877
let noMergeBase = false;
3878-
core.startGroup(`Searching for merge-base ${base}...${headRef}`);
3878+
core.startGroup(`Searching for merge-base ${base}...${head}`);
38793879
try {
38803880
baseRef = await getFullRef(base);
38813881
headRef = await getFullRef(head);
38823882
if (!(await hasMergeBase())) {
38833883
await exec_1.default('git', ['fetch', '--no-tags', `--depth=${initialFetchDepth}`, 'origin', base, head]);
38843884
if (baseRef === undefined || headRef === undefined) {
3885-
baseRef = baseRef !== null && baseRef !== void 0 ? baseRef : await getFullRef(base);
3886-
headRef = headRef !== null && headRef !== void 0 ? headRef : await getFullRef(head);
3885+
baseRef = baseRef !== null && baseRef !== void 0 ? baseRef : (await getFullRef(base));
3886+
headRef = headRef !== null && headRef !== void 0 ? headRef : (await getFullRef(head));
38873887
if (baseRef === undefined || headRef === undefined) {
38883888
await exec_1.default('git', ['fetch', '--tags', '--depth=1', 'origin', base, head], {
38893889
ignoreReturnCode: true // returns exit code 1 if tags on remote were updated - we can safely ignore it
38903890
});
3891-
baseRef = baseRef !== null && baseRef !== void 0 ? baseRef : await getFullRef(base);
3892-
headRef = headRef !== null && headRef !== void 0 ? headRef : await getFullRef(head);
3891+
baseRef = baseRef !== null && baseRef !== void 0 ? baseRef : (await getFullRef(base));
3892+
headRef = headRef !== null && headRef !== void 0 ? headRef : (await getFullRef(head));
38933893
if (baseRef === undefined) {
38943894
throw new Error(`Could not determine what is ${base} - fetch works but it's not a branch or tag`);
38953895
}

src/git.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ export async function getChangesSinceMergeBase(base: string, head: string, initi
6565
}
6666

6767
let noMergeBase = false
68-
core.startGroup(`Searching for merge-base ${base}...${headRef}`)
68+
core.startGroup(`Searching for merge-base ${base}...${head}`)
6969
try {
7070
baseRef = await getFullRef(base)
7171
headRef = await getFullRef(head)

0 commit comments

Comments
 (0)