Check for provided commit message

In order to not overwrite the commit message with just the contents
of the file we check for a given commit message. If a commit message
is specified the file will be ignored.

Author: sebastianfeldmann

src/Hook/Message/Action/PrepareFromFile.php

@@ -23,6 +23,14 @@
 /**
  * Class PrepareFromFile
  *
+ * Example configuration:
+ * {
+ *   "action": "\\CaptainHook\\App\\Hook\\Message\\Action\\PrepareFromFile"
+ *   "options": {
+ *     "file": ".git/CH_MSG_CACHE"
+ *   }
+ * }
+ *
  * @package CaptainHook
  * @author  Sebastian Feldmann <[email protected]>
  * @link    https://github.com/captainhookphp/captainhook
@@ -47,13 +55,18 @@ public function execute(Config $config, IO $io, Repository $repository, Config\A
         if (empty($options->get('file', ''))) {
             throw new ActionFailed('PrepareFromFile requires \'file\' option');
         }
-        if (!is_file($cacheFile)) {
-            return;
+
+        // if there is a commit message don't do anything just delete the file
+        if ($repository->getCommitMsg()->isEmpty()) {
+            if (!is_file($cacheFile)) {
+                return;
+            }
+            $msg = (string)file_get_contents($cacheFile);
+            $repository->setCommitMsg(
+                new CommitMessage($msg, $repository->getCommitMsg()->getCommentCharacter())
+            );
         }
-        $msg = (string) file_get_contents($cacheFile);
-        $repository->setCommitMsg(
-            new CommitMessage($msg, $repository->getCommitMsg()->getCommentCharacter())
-        );
+
         if (!$options->get('keep', false)) {
             unlink($cacheFile);
         }