Skip to content

W
wiki-js
Unverified Commit 73af37b8 authored by CDN's avatar CDN Committed by GitHub
Browse files
Options

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

parent 143c6db0
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
server/modules/storage/git/storage.js
View file @ 73af37b8
......@@ -118,7 +118,7 @@ module.exports = {
* 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()
......@@ -140,7 +140,7 @@ module.exports = {
// Process Changes
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])
if (_.get(diff, 'files', []).length > 0) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment