👔 up: update the git ac, up commands logic

inhere · Dec 29, 2022 · 69ce317 · 69ce317
1 parent 033386f
commit 69ce317
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/app/Console/SubCmd/Gitflow/UpdateNoPushCmd.php b/app/Console/SubCmd/Gitflow/UpdateNoPushCmd.php
@@ -7,6 +7,7 @@
 use Inhere\Console\IO\Output;
 use Throwable;
 use Toolkit\PFlag\FlagsParser;
+use function array_unshift;
 
 /**
  * Class UpdateNoPushCmd
@@ -44,9 +45,10 @@ protected function configFlags(FlagsParser $fs): void
     protected function execute(Input $input, Output $output): int
     {
         $flags = $this->flags->getFlags();
-        $flags[] = '--np';
+        array_unshift($flags, '--np');
 
         $upCmd = new UpdatePushCmd($input, $output);
+        $upCmd->setParent($this->getParent());
         $upCmd->run($flags);
 
         return 0;

diff --git a/app/Console/SubCmd/Gitflow/UpdatePushCmd.php b/app/Console/SubCmd/Gitflow/UpdatePushCmd.php
@@ -60,6 +60,8 @@ protected function execute(Input $input, Output $output): int
 
         if ($gx->getRepo()->hasBranch($upBranch, $mainRemote)) {
             $runner->addf('git pull %s %s', $mainRemote, $upBranch);
+        } else {
+            $runner->addf('git fetch %s -np', $mainRemote);
         }
 
         $defBranch = $gx->getDefaultBranch();

diff --git a/app/Console/SubCmd/GitxCmd/AddCommitCmd.php b/app/Console/SubCmd/GitxCmd/AddCommitCmd.php
@@ -6,6 +6,7 @@
 use Inhere\Console\IO\Input;
 use Inhere\Console\IO\Output;
 use Throwable;
+use function array_unshift;
 
 /**
  * class AddCommitCmd
@@ -39,9 +40,10 @@ public static function aliases(): array
     protected function execute(Input $input, Output $output): void
     {
         $flags = $this->flags->getFlags();
-        $flags[] = '--np';
+        array_unshift($flags, '--np');
 
         $upCmd = new AddCommitPushCmd($input, $output);
+        $upCmd->setParent($this->getParent());
         $upCmd->run($flags);
     }
 }
diff --git a/app/Console/Command/InitCommand.php → app/Console/SubCmd/InitCommand.php b/app/Console/Command/InitCommand.php → app/Console/SubCmd/InitCommand.php
@@ -7,7 +7,7 @@
  * @license  MIT
  */
 
-namespace Inhere\Kite\Console\Command;
+namespace Inhere\Kite\Console\SubCmd;
 
 use Inhere\Console\Command;
 use Inhere\Console\IO\Input;