Merge branch 'develop' into feat-force-tag

update chglog
fix(scoop-update): Force sync tags w/ remote branch while scoop update
2025-10-30 06:07:56 +00:00 · 2025-08-18 19:17:54 +08:00 · 2025-08-13 14:52:43 +08:00 · 2025-08-13 14:35:55 +08:00
2 changed files with 2 additions and 1 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@

 ### Bug Fixes

+- **scoop-update**: Force sync tags w/ remote branch while scoop update ([#6439](https://github.com/ScoopInstaller/Scoop/issues/6439))
 - **scoop-download**: Fix function `nightly_version` not defined error ([#6386](https://github.com/ScoopInstaller/Scoop/issues/6386))

 ## [v0.5.3](https://github.com/ScoopInstaller/Scoop/compare/v0.5.2...v0.5.3) - 2025-08-11
--- a/libexec/scoop-update.ps1
+++ b/libexec/scoop-update.ps1
@@ -136,7 +136,7 @@ function Sync-Scoop {
            # reset branch HEAD
            Invoke-Git -Path $currentdir -ArgumentList @('reset', '--hard', "origin/$configBranch", '-q')
        } else {
-            Invoke-Git -Path $currentdir -ArgumentList @('pull', '-q')
+            Invoke-Git -Path $currentdir -ArgumentList @('pull', '--tags', '--force', '-q')
        }

        $res = $lastexitcode
Author	SHA1	Message	Date
Hsiao-nan Cheung	5bd165a259	Merge branch 'develop' into feat-force-tag	2025-08-18 19:17:54 +08:00
Hsiao-nan Cheung	01b6bf07cd	update chglog	2025-08-13 14:52:43 +08:00
Hsiao-nan Cheung	bc6d43c733	fix(scoop-update): Force sync tags w/ remote branch while scoop update	2025-08-13 14:35:55 +08:00