mirror of
https://github.com/ScoopInstaller/Scoop.git
synced 2025-12-13 11:36:04 +00:00
fix(scoop-update): Force sync tags w/ remote branch while scoop update (#6439)
This commit is contained in:
@@ -6,6 +6,7 @@
|
|||||||
|
|
||||||
### Bug Fixes
|
### 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))
|
- **scoop-download:** Fix function `nightly_version` not defined error ([#6386](https://github.com/ScoopInstaller/Scoop/issues/6386))
|
||||||
- **autoupdate:** Use origin URL to handle URLs with fragment in GitHub mode ([#6455](https://github.com/ScoopInstaller/Scoop/issues/6455))
|
- **autoupdate:** Use origin URL to handle URLs with fragment in GitHub mode ([#6455](https://github.com/ScoopInstaller/Scoop/issues/6455))
|
||||||
- **buckets|scoop-info:** Switch git log date format to ISO 8601 to avoid locale issues ([#6446](https://github.com/ScoopInstaller/Scoop/issues/6446))
|
- **buckets|scoop-info:** Switch git log date format to ISO 8601 to avoid locale issues ([#6446](https://github.com/ScoopInstaller/Scoop/issues/6446))
|
||||||
|
|||||||
@@ -136,7 +136,7 @@ function Sync-Scoop {
|
|||||||
# reset branch HEAD
|
# reset branch HEAD
|
||||||
Invoke-Git -Path $currentdir -ArgumentList @('reset', '--hard', "origin/$configBranch", '-q')
|
Invoke-Git -Path $currentdir -ArgumentList @('reset', '--hard', "origin/$configBranch", '-q')
|
||||||
} else {
|
} else {
|
||||||
Invoke-Git -Path $currentdir -ArgumentList @('pull', '-q')
|
Invoke-Git -Path $currentdir -ArgumentList @('pull', '--tags', '--force', '-q')
|
||||||
}
|
}
|
||||||
|
|
||||||
$res = $lastexitcode
|
$res = $lastexitcode
|
||||||
|
|||||||
Reference in New Issue
Block a user