From 65d8bdf167b3f43d9687f86e2666984efea176d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=B6ller?= <am@localheinz.com>
Date: Fri, 22 Nov 2019 11:52:51 +0100
Subject: [PATCH 1/2] Fix: Add files that are not tracked yet
---
entrypoint.sh | 42 +++++++++++++++++++++++-------------------
foo | 0
2 files changed, 23 insertions(+), 19 deletions(-)
create mode 100644 foo
diff --git a/entrypoint.sh b/entrypoint.sh
index 50526fb..1b81524 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -19,26 +19,30 @@ EOF
git config --global user.name "GitHub Actions"
}
-# This section only runs if there have been file changes
+git_setup
+
+echo "INPUT_BRANCH value: $INPUT_BRANCH";
+
+# Switch to branch from current Workflow run
+git checkout $INPUT_BRANCH
+
+echo "INPUT_FILE_PATTERN: ${INPUT_FILE_PATTERN}"
+
+git add "${INPUT_FILE_PATTERN}"
+
echo "Checking for uncommitted changes in the git working tree."
-if ! git diff --quiet
+
+if ! git diff --staged --quiet
then
- git_setup
-
- echo "INPUT_BRANCH value: $INPUT_BRANCH";
-
- # Switch to branch from current Workflow run
- git checkout $INPUT_BRANCH
-
- echo "INPUT_FILE_PATTERN: ${INPUT_FILE_PATTERN}"
-
- git add "${INPUT_FILE_PATTERN}"
-
- echo "INPUT_COMMIT_OPTIONS: ${INPUT_COMMIT_OPTIONS}"
-
- git commit -m "$INPUT_COMMIT_MESSAGE" --author="$GITHUB_ACTOR <$GITHUB_ACTOR@users.noreply.github.com>" ${INPUT_COMMIT_OPTIONS:+"$INPUT_COMMIT_OPTIONS"}
-
- git push --set-upstream origin "HEAD:$INPUT_BRANCH"
-else
echo "Working tree clean. Nothing to commit."
+
+ exit 0
fi
+
+echo "Found added/changed files."
+
+echo "INPUT_COMMIT_OPTIONS: ${INPUT_COMMIT_OPTIONS}"
+
+git commit -m "$INPUT_COMMIT_MESSAGE" --author="$GITHUB_ACTOR <$GITHUB_ACTOR@users.noreply.github.com>" ${INPUT_COMMIT_OPTIONS:+"$INPUT_COMMIT_OPTIONS"}
+
+git push --set-upstream origin "HEAD:$INPUT_BRANCH"
diff --git a/foo b/foo
new file mode 100644
index 0000000..e69de29
From 188fc2bd5804b031760f9013f0f113b6e6086d5e Mon Sep 17 00:00:00 2001
From: Stefan Zweifel <stefanzweifel@users.noreply.github.com>
Date: Fri, 22 Nov 2019 12:59:27 +0100
Subject: [PATCH 2/2] Delete foo
---
foo | 0
1 file changed, 0 insertions(+), 0 deletions(-)
delete mode 100644 foo
diff --git a/foo b/foo
deleted file mode 100644
index e69de29..0000000