Merge pull request #43 from salahhusa9/git-checkout-throw-away-local-…

…modifications Git checkout throw away local modifications
salahhusa9 · Apr 1, 2024 · 257143f · 257143f
2 parents 81d8f5c + f48c468
commit 257143f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/src/Helpers/Git.php b/src/Helpers/Git.php
@@ -108,7 +108,7 @@ public static function pull()
      */
     public static function checkout($branch)
     {
-        $process = Process::run(self::gitPath().' checkout '.$branch);
+        $process = Process::run(self::gitPath().' checkout '.$branch.' -f');
 
         if ($process->failed()) {
             throw new GitFailedException('this command failed: '.$process->command().' with message: '.$process->errorOutput());

diff --git a/tests/GitTest.php b/tests/GitTest.php
@@ -170,7 +170,7 @@ public function test_git_pull_failed(): void
     public function test_git_checkout(): void
     {
         Process::fake([
-            'git checkout branch-name' => Process::result(''),
+            'git checkout branch-name -f' => Process::result(''),
         ]);
 
         config()->set('updater.git_path', 'git');
@@ -184,7 +184,7 @@ public function test_git_checkout_failed(): void
         $this->expectExceptionMessage('Test error output');
 
         Process::fake([
-            'git checkout branch-name' => Process::result(
+            'git checkout branch-name -f' => Process::result(
                 output: 'Test output',
                 errorOutput: 'Test error output',
                 exitCode: 1,

diff --git a/tests/UpdaterTest.php b/tests/UpdaterTest.php
@@ -149,7 +149,7 @@ public function testUpdate()
             'git rev-parse --abbrev-ref HEAD' => 'HEAD',
             'git describe --tags --abbrev=0' => '1.0.0',
             'git pull' => '',
-            'git checkout 1.0.1' => 'TEST',
+            'git checkout 1.0.1 -f' => 'TEST',
             'git remote set-url origin https://salahhusa9:salahhusa9@github.com/salahhusa9/laravel-test.git' => '',
             'git fetch' => '',
         ]);
@@ -162,7 +162,7 @@ public function testUpdate()
             'git rev-parse --abbrev-ref HEAD' => 'HEAD',
             'git describe --tags --abbrev=0' => '1.0.0',
             'git pull origin HEAD' => '',
-            'git checkout 1.0.1' => '...',
+            'git checkout 1.0.1 -f' => '...',
             'git remote set-url origin https://salahhusa9:salahhusa9@github.com/salahhusa9/laravel-test.git' => '',
             'git fetch' => '',
         ]);