Merge pull request #1067 from relative-ci/fix-commit-message-env-vari…

…able fix: Commit message argument - do not override _COMMIT_MESSAGE env variable with the git command
relative-ci · Feb 1, 2024 · f89f16f · f89f16f
2 parents dd07fb7 + 6a0cebc
commit f89f16f
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/agent.js b/src/agent.js
@@ -64,8 +64,10 @@ export const agent = (artifactsData, config, args = {}, logger = console) => {
     ...normalizedEnvVars,
 
     // Get commit message using git if includeCommitMessage is set and
-    // there is no --commit-message argument
-    ...includeCommitMessage && !args.commitMessage && { commitMessage: getCommitMessage() },
+    // there is no --commit-message argument or RELATIVE_CI_COMMIT_MESSAGE
+    ...includeCommitMessage && !normalizedEnvVars.commitMessage && {
+      commitMessage: getCommitMessage(),
+    },
   };
 
   debug('Job parameters', maskObjectProperties(params, ['key']));