修正 git 在切換 branch 時的錯誤

gnehs · Aug 12, 2018 · 9f6fd69 · 9f6fd69 · lekoOwO · Aug 12, 2018
1 parent fbb887d
commit 9f6fd69
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/index.js b/index.js
@@ -30,8 +30,8 @@ git
         if (branch != (config.PokaPlayer.debug ? 'dev' : 'master')) {
             git
                 .fetch(["--all"])
-                .then(() => git.reset(["--hard", "origin/" + config.PokaPlayer.debug ? 'dev' : 'master']))
                 .then(() => git.checkout(config.PokaPlayer.debug ? 'dev' : 'master'))
+                .then(() => git.reset(["--hard", "origin/" + config.PokaPlayer.debug ? 'dev' : 'master']))
                 .then(process.exit)
                 .catch(err => {
                     console.error('failed: ', err)
@@ -124,6 +124,7 @@ io.on('connection', socket => {
             git
                 .fetch(["--all"])
                 .then(() => socket.emit('git', 'fetch'))
+                .then(() => git.checkout(config.PokaPlayer.debug ? 'dev' : 'master'))
                 .then(() => git.reset(["--hard", "origin/" + config.PokaPlayer.debug ? 'dev' : 'master']))
                 .then(() => socket.emit('git', 'reset'))
                 .then(() => socket.emit('restart'))
@@ -144,6 +145,7 @@ app.get('/upgrade', (req, res) => {
         if (!config.PokaPlayer.instantUpgradeProcess) {
             git
                 .fetch(["--all"])
+                .then(() => git.checkout(config.PokaPlayer.debug ? 'dev' : 'master'))
                 .then(() => git.reset(["--hard", "origin/" + config.PokaPlayer.debug ? 'dev' : 'master']))
                 .then(() => res.send('upgrade'))
                 .then(() => process.exit())