From 08937a7751578191b540764b82302182a0befa59 Mon Sep 17 00:00:00 2001
From: peaceiris <30958501+peaceiris@users.noreply.github.com>
Date: Mon, 6 Jan 2020 23:20:33 +0900
Subject: [PATCH] feat: Add commitMessage option

Close #74
cf. #72 and #73
---
 action.yml    |  3 +++
 entrypoint.sh | 12 +++++++++---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/action.yml b/action.yml
index 823ab78..b569493 100644
--- a/action.yml
+++ b/action.yml
@@ -26,3 +26,6 @@ inputs:
   useremail:
     description: 'Set Git user.email'
     required: false
+  commitMessage:
+    description: 'Set custom commit message'
+    required: false
diff --git a/entrypoint.sh b/entrypoint.sh
index af3ad95..4efb3ad 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -118,10 +118,16 @@ git add --all
 
 print_info "Allowing empty commits: ${INPUT_EMPTYCOMMITS}"
 
-if [ -n "${EXTERNAL_REPOSITORY}" ]; then
-    COMMIT_MESSAGE="Automated deployment: $(date -u) ${GITHUB_REPOSITORY}@${GITHUB_SHA}"
+if [ -n "${INPUT_COMMITMESSAGE}" ]; then
+    BASE_COMMIT_MESSAGE="${INPUT_COMMITMESSAGE}"
 else
-    COMMIT_MESSAGE="Automated deployment: $(date -u) ${GITHUB_SHA}"
+    BASE_COMMIT_MESSAGE="Automated deployment: $(date -u)"
+fi
+
+if [ -n "${EXTERNAL_REPOSITORY}" ]; then
+    COMMIT_MESSAGE="${BASE_COMMIT_MESSAGE} ${GITHUB_REPOSITORY}@${GITHUB_SHA}"
+else
+    COMMIT_MESSAGE="${BASE_COMMIT_MESSAGE} ${GITHUB_SHA}"
 fi
 
 if [[ ${INPUT_EMPTYCOMMITS} == "false" ]]; then