fix: gitlab git command

mattzcarey · Aug 3, 2023 · 4f19728 · 4f19728
1 parent d195163
commit 4f19728
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/common/git/getChangedFilesNames.ts b/src/common/git/getChangedFilesNames.ts
@@ -11,8 +11,8 @@ export const getChangedFilesNamesCommand = (
     const { githubSha, baseSha } = getGitHubEnvVariables();
     return `git diff --name-only --diff-filter=AMT ${baseSha} ${githubSha}`;
   } else if (isCi === PlatformOptions.GITLAB) {
-    const { mergeRequestBaseSha } = getGitLabEnvVariables();
-    return `git diff --name-only ${mergeRequestBaseSha}...HEAD`;
+    const { gitlabSha, mergeRequestBaseSha } = getGitLabEnvVariables();
+    return `git diff --name-only --diff-filter=AMT ${mergeRequestBaseSha} ${gitlabSha}`;
   }
   return "git diff --name-only --diff-filter=AMT --cached";
 };

diff --git a/src/config.ts b/src/config.ts
@@ -35,6 +35,7 @@ export const getGitLabEnvVariables = (): Record<string, string> => {
     "CI_MERGE_REQUEST_DIFF_BASE_SHA",
     "CI_PROJECT_ID",
     "CI_MERGE_REQUEST_IID",
+    "CI_COMMIT_SHA",
     "GITLAB_TOKEN",
   ].filter((varName) => !process.env[varName]);
   if (missingVars.length > 0) {
@@ -43,6 +44,7 @@ export const getGitLabEnvVariables = (): Record<string, string> => {
   }
   return {
     mergeRequestBaseSha: process.env.CI_MERGE_REQUEST_DIFF_BASE_SHA as string,
+    gitlabSha: process.env.CI_COMMIT_SHA as string,
     gitlabToken: process.env.GITLAB_TOKEN as string,
     projectId: process.env.CI_PROJECT_ID as string,
     mergeRequestIIdString: process.env.CI_MERGE_REQUEST_IID as string,