From 9642114e95845146357fe891b274a592bc00bc8a Mon Sep 17 00:00:00 2001 From: ruki Date: Thu, 11 Jan 2024 00:52:29 +0800 Subject: [PATCH] fix stash --- scripts/autoupdate.lua | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/scripts/autoupdate.lua b/scripts/autoupdate.lua index 8afc7cd10..def744e9a 100644 --- a/scripts/autoupdate.lua +++ b/scripts/autoupdate.lua @@ -40,7 +40,7 @@ function _update_version(instance, version, shasum) local branch = "autoupdate-" .. instance:name() .. "-" .. version local branch_current = os.iorun("git branch --show-current"):trim() local repourl = "https://github.com/xmake-io/xmake-repo.git" - os.vexec("git stash") + os.vexec("git reset --hard HEAD") os.vexec("git branch -D %s", branch) os.vexec("git checkout dev") os.vexec("git pull %s dev", repourl) @@ -68,7 +68,6 @@ function _update_version(instance, version, shasum) end os.vexec("git reset --hard HEAD") os.vexec("git checkout %s", branch_current) - os.vexec("git stash pop") end function main(maxcount)