fixes #13: Allow passing current branch to validate commits.

mattsqd · Jul 31, 2024 · dbfebab · dbfebab
1 parent 73dc19c
commit dbfebab
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/Robo/Plugin/Commands/ValidateCommands.php b/src/Robo/Plugin/Commands/ValidateCommands.php
@@ -396,6 +396,7 @@ public function validateCommitMessages(
         array $opts = [
             'project-id' => '',
             'target-branch' => 'develop',
+            'current-branch' => 'HEAD',
             'git-remote' => 'origin',
             'pattern' => '/^{$project_id}-(\d+): /',
             'short-help' => 'Commit messages must start with: \'{$project_id}-x:y\'',
@@ -417,12 +418,14 @@ public function validateCommitMessages(
         ] = $this->getOptions(['project-id', 'long-help'], $opts, false);
         [
             $target_branch,
+            $current_branch,
             $git_remote,
             $pattern,
             $short_help,
         ] = $this->getOptions(
             [
                 'target-branch',
+                'current-branch',
                 'git-remote',
                 'pattern',
                 'short-help',
@@ -448,8 +451,8 @@ public function validateCommitMessages(
             return new ResultData(ResultData::EXITCODE_ERROR);
         }
         var_dump('CURRENT BRANCH:');
-        var_dump($this->getGitBranch());
-        $git_command = "git log $git_remote/$target_branch...HEAD --pretty=format:%s --no-merges";
+        var_dump($current_branch);
+        $git_command = "git log $git_remote/$target_branch...$current_branch --pretty=format:%s --no-merges";
         exec($git_command, $output, $result_code);
         if ($result_code !== 0) {
             $this->printError('Unable to git log data.');