fix: can generate changelog on tag is empty

inhere · Nov 11, 2021 · bf9d5a6 · bf9d5a6
1 parent 7346fcd
commit bf9d5a6
Showing 1 changed file with 9 additions and 7 deletions.
diff --git a/app/Console/Controller/GitController.php b/app/Console/Controller/GitController.php
@@ -288,7 +288,7 @@ public function branchCommand(FlagsParser $fs, Output $output): void
                 $name = substr($name, $rmtLen);
             }
 
-            if ($keyword && strpos($name, $keyword) === false) {
+            if ($keyword && !str_contains($name, $keyword)) {
                 continue;
             }
 
@@ -857,7 +857,10 @@ public function changelogCommand(FlagsParser $fs, Output $output): void
         }
 
         $output->info('collect git log output');
-        $builder->add("$oldVersion...$newVersion");
+        if ($oldVersion && $newVersion) {
+            $builder->add("$oldVersion...$newVersion");
+        }
+
         $builder->addf('--pretty=format:"%s"', $logFmt);
 
         // $b->addIf("--exclude $exclude", $exclude);
@@ -869,9 +872,8 @@ public function changelogCommand(FlagsParser $fs, Output $output): void
 
         $repoUrl = $fs->getOpt('repo-url');
         if (!$repoUrl) {
-            $info = $repo->getRemoteInfo();
-
-            $repoUrl = $info->getHttpUrl();
+            $rmtInfo = $repo->getRemoteInfo();
+            $repoUrl = $rmtInfo->getHttpUrl();
         }
 
         $output->info('repo URL: ' . $repoUrl);
@@ -940,9 +942,9 @@ protected function getLogVersion(string $version): string
     }
 
     /**
-     * @var TagsInfo
+     * @var TagsInfo|null
      */
-    private $tagsInfo;
+    private ?TagsInfo $tagsInfo = null;
 
     /**
      * @return TagsInfo