Merge 4c5aaae1a5 into b82ff81ffb

dist/index.js

@@ -363,8 +363,8 @@ exports.listAllFilesAsAdded = listAllFilesAsAdded;
 async function getCurrentRef() {
     core.startGroup(`Get current git ref`);
     try {
-        const branch = (await (0, exec_1.getExecOutput)('git', ['rev-parse', '--abbrev-ref', 'HEAD'])).stdout.trim();
-        if (branch && branch !== 'HEAD') {
+        const branch = (await (0, exec_1.getExecOutput)('git', ['branch', '--show-current'])).stdout.trim();
+        if (branch) {
             return branch;
         }
         const describe = await (0, exec_1.getExecOutput)('git', ['describe', '--tags', '--exact-match'], { ignoreReturnCode: true });
@@ -640,7 +640,7 @@ async function getChangedFiles(token, base, ref, initialFetchDepth) {
                 // At the same time we don't want to fetch any code from forked repository
                 throw new Error(`'token' input parameter is required if action is triggered by 'pull_request_target' event`);
             }
-            core.info('GitHub token is not available - changes will be detected using git diff');
+            core.info('Github token is not available - changes will be detected using git diff');
             const baseSha = (_a = github.context.payload.pull_request) === null || _a === void 0 ? void 0 : _a.base.sha;
             const defaultBranch = (_b = github.context.payload.repository) === null || _b === void 0 ? void 0 : _b.default_branch;
             const currentRef = await git.getCurrentRef();
@@ -710,7 +710,7 @@ async function getChangedFilesFromGit(base, head, initialFetchDepth) {
 }
 // Uses github REST api to get list of files changed in PR
 async function getChangedFilesFromApi(token, pullRequest) {
-    core.startGroup(`Fetching list of changed files for PR#${pullRequest.number} from GitHub API`);
+    core.startGroup(`Fetching list of changed files for PR#${pullRequest.number} from Github API`);
     try {
         const client = github.getOctokit(token);
         const per_page = 100;

src/git.ts

@@ -166,8 +166,8 @@ export async function listAllFilesAsAdded(): Promise<File[]> {
 export async function getCurrentRef(): Promise<string> {
   core.startGroup(`Get current git ref`)
   try {
-    const branch = (await getExecOutput('git', ['rev-parse', '--abbrev-ref', 'HEAD'])).stdout.trim()
-    if (branch && branch !== 'HEAD') {
+    const branch = (await getExecOutput('git', ['branch', '--show-current'])).stdout.trim()
+    if (branch) {
       return branch
     }
 

src/main.ts

@@ -107,7 +107,7 @@ async function getChangedFiles(token: string, base: string, ref: string, initial
         // At the same time we don't want to fetch any code from forked repository
         throw new Error(`'token' input parameter is required if action is triggered by 'pull_request_target' event`)
       }
-      core.info('GitHub token is not available - changes will be detected using git diff')
+      core.info('Github token is not available - changes will be detected using git diff')
       const baseSha = github.context.payload.pull_request?.base.sha
       const defaultBranch = github.context.payload.repository?.default_branch
       const currentRef = await git.getCurrentRef()
@@ -194,7 +194,7 @@ async function getChangedFilesFromGit(base: string, head: string, initialFetchDe
 
 // Uses github REST api to get list of files changed in PR
 async function getChangedFilesFromApi(token: string, pullRequest: PullRequest): Promise<File[]> {
-  core.startGroup(`Fetching list of changed files for PR#${pullRequest.number} from GitHub API`)
+  core.startGroup(`Fetching list of changed files for PR#${pullRequest.number} from Github API`)
   try {
     const client = github.getOctokit(token)
     const per_page = 100