liz/wikijs-fork
liz/wikijs-fork
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: git log should explicitly separate branch from paths (#5911)

Browse Source
This commit is contained in:
CDN 2022-12-02 15:33:24 +08:00 committed by GitHub
parent 143c6db0f0
commit 73af37b81b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/modules/storage/git/storage.js
View File

@ -118,7 +118,7 @@ module.exports = {
* SYNC * SYNC
*/ */
async sync() { async sync() {
const currentCommitLog = _.get(await this.git.log(['-n', '1', this.config.branch]), 'latest', {}) const currentCommitLog = _.get(await this.git.log(['-n', '1', this.config.branch, '--']), 'latest', {})
const rootUser = await WIKI.models.users.getRootUser() const rootUser = await WIKI.models.users.getRootUser()
@ -140,7 +140,7 @@ module.exports = {
// Process Changes // Process Changes
if (_.includes(['sync', 'pull'], this.mode)) { if (_.includes(['sync', 'pull'], this.mode)) {
const latestCommitLog = _.get(await this.git.log(['-n', '1', this.config.branch]), 'latest', {}) const latestCommitLog = _.get(await this.git.log(['-n', '1', this.config.branch, '--']), 'latest', {})
const diff = await this.git.diffSummary(['-M', currentCommitLog.hash, latestCommitLog.hash]) const diff = await this.git.diffSummary(['-M', currentCommitLog.hash, latestCommitLog.hash])
if (_.get(diff, 'files', []).length > 0) { if (_.get(diff, 'files', []).length > 0) {