Merge branch 'hotfix/3.2.8'

factorial-io · Dec 10, 2019 · 0211065 · 0211065
2 parents 3de86de + e4a4e24
commit 0211065
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## 3.2.8 / 2019-12-10
+
+### Fixed
+
+  * Harden behavior of committing artifacts.
+
 ## 3.2.7 / 2019-12-06
 
 ### New/Fixed:

diff --git a/src/Method/ArtifactsGitMethod.php b/src/Method/ArtifactsGitMethod.php
@@ -258,7 +258,8 @@ protected function pushToTargetRepository(HostConfig $host_config, TaskContextIn
             $formatted_message .= "\n\n  * " . implode("\n  * ", $detailed_messages);
         }
 
-        $shell->run(sprintf('#!git commit -m "%s" || true', escapeshellarg($formatted_message)));
+        $shell->run(sprintf('#!git commit --allow-empty -m "%s"', addslashes($formatted_message)));
+
         if ($tag = $context->getResult('commitTag')) {
             $shell->run(sprintf('#!git push origin :refs/tags/%s || true', $tag));
             $shell->run(sprintf('#!git tag --delete %s || true', $tag));

diff --git a/src/Utilities/Utilities.php b/src/Utilities/Utilities.php
@@ -8,7 +8,7 @@
 class Utilities
 {
 
-    const FALLBACK_VERSION = '3.2.7';
+    const FALLBACK_VERSION = '3.2.8';
 
     public static function mergeData(array $data, array $override_data): array
     {