diff --git a/package.json b/package.json index 8ad217ed..cea30061 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,7 @@ "oicq": "link:lib/modules/oicq", "pm2": "^5.3.1", "puppeteer": "*", - "redis": "^4.6.13", + "redis": "^4.6.14", "sequelize": "^6.37.3", "sqlite3": "5.1.6", "ulid": "^2.3.0", diff --git a/plugins/other/update.js b/plugins/other/update.js index aae18689..e0b288a1 100644 --- a/plugins/other/update.js +++ b/plugins/other/update.js @@ -178,7 +178,7 @@ export class update extends plugin { else if (/be overwritten by merge|被合并操作覆盖/.test(error) || /Merge conflict|合并冲突/.test(stdout)) await this.reply(`${error}\n${stdout}\n若修改过文件请手动更新,否则发送 #强制更新${plugin}`) else if (/divergent branches|偏离的分支/.test(error)) { - const ret = await this.exec("git pull --rebase") + const ret = await this.exec("git pull --rebase", plugin) if (!ret.error && /Successfully rebased|成功变基/.test(ret.stdout+ret.stderr)) return true await this.reply(`${error}\n${stdout}\n若修改过文件请手动更新,否则发送 #强制更新${plugin}`)