RageStudio/relic
1
0
Fork 0
mirror of https://github.com/ragestudio/relic.git synced 2025-06-09 10:34:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

use pull rebase after reset

Browse Source
This commit is contained in:
SrGooglo 2024-02-04 21:52:18 +01:00
parent d2f0cf9d10
commit d6170aafc3
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/pkg_mng/installs_steps_methods/git_pull.js
View File

@ -19,7 +19,7 @@ export default async (manifest, step) => {
fs.mkdirSync(_path, { recursive: true }) fs.mkdirSync(_path, { recursive: true })
await execa(gitCMD, ["pull"], { await execa(gitCMD, ["pull", "--rebase"], {
cwd: _path, cwd: _path,
stdout: "inherit", stdout: "inherit",
stderr: "inherit", stderr: "inherit",

8
src/main/pkg_mng/installs_steps_methods/git_reset.js
View File

@ -49,10 +49,7 @@ export default async (manifest, step) => {
statusText: `Reset from ${from}`, statusText: `Reset from ${from}`,
}) })
// pull the latest console.log(`[${manifest.id}] steps.git_reset() | Resetting to ${from}`)
await git_pull(manifest, step)
console.log(`[${manifest.id}] steps.git_reset() | Reseting to ${from}`)
await execa(gitCMD, ["reset", "--hard", from], { await execa(gitCMD, ["reset", "--hard", from], {
cwd: _path, cwd: _path,
@ -60,6 +57,9 @@ export default async (manifest, step) => {
stderr: "inherit", stderr: "inherit",
}) })
// pull the latest
await git_pull(manifest, step)
sendToRender(`pkg:update:status`, { sendToRender(`pkg:update:status`, {
id: manifest.id, id: manifest.id,
statusText: `Checkout to HEAD`, statusText: `Checkout to HEAD`,