From e3d94f71775de731d6ac674ee3ef4e6e05409c1d Mon Sep 17 00:00:00 2001
From: El Gato da Great <max32268@gmail.com>
Date: Thu, 26 May 2022 19:42:14 -0500
Subject: [PATCH] fix: don't push files to git if ignored (#5334)
* fix: don't push files to git if ignored
* tweak: change gitPath var to gitFilePath
* fix: "update" instead of "create" of updated file
Co-authored-by: Jacob Parker <blocckba5her@gmail.com>
Co-authored-by: DevBlocky <16978528+DevBlocky@users.noreply.github.com>
---
server/modules/storage/git/storage.js | 33 +++++++++++++++++----------
1 file changed, 21 insertions(+), 12 deletions(-)
diff --git a/server/modules/storage/git/storage.js b/server/modules/storage/git/storage.js
index 2b175d48..b047233b 100644
--- a/server/modules/storage/git/storage.js
+++ b/server/modules/storage/git/storage.js
@@ -289,10 +289,13 @@ module.exports = {
const filePath = path.join(this.repoPath, fileName)
await fs.outputFile(filePath, page.injectMetadata(), 'utf8')
- await this.git.add(`./${fileName}`)
- await this.git.commit(`docs: create ${page.path}`, fileName, {
- '--author': `"${page.authorName} <${page.authorEmail}>"`
- })
+ const gitFilePath = `./${fileName}`
+ if ((await this.git.checkIgnore(gitFilePath)).length === 0) {
+ await this.git.add(gitFilePath)
+ await this.git.commit(`docs: create ${page.path}`, fileName, {
+ '--author': `"${page.authorName} <${page.authorEmail}>"`
+ })
+ }
},
/**
* UPDATE
@@ -308,10 +311,13 @@ module.exports = {
const filePath = path.join(this.repoPath, fileName)
await fs.outputFile(filePath, page.injectMetadata(), 'utf8')
- await this.git.add(`./${fileName}`)
- await this.git.commit(`docs: update ${page.path}`, fileName, {
- '--author': `"${page.authorName} <${page.authorEmail}>"`
- })
+ const gitFilePath = `./${fileName}`
+ if ((await this.git.checkIgnore(gitFilePath)).length === 0) {
+ await this.git.add(gitFilePath)
+ await this.git.commit(`docs: update ${page.path}`, fileName, {
+ '--author': `"${page.authorName} <${page.authorEmail}>"`
+ })
+ }
},
/**
* DELETE
@@ -325,10 +331,13 @@ module.exports = {
fileName = `${page.localeCode}/${fileName}`
}
- await this.git.rm(`./${fileName}`)
- await this.git.commit(`docs: delete ${page.path}`, fileName, {
- '--author': `"${page.authorName} <${page.authorEmail}>"`
- })
+ const gitFilePath = `./${fileName}`
+ if ((await this.git.checkIgnore(gitFilePath)).length === 0) {
+ await this.git.rm(gitFilePath)
+ await this.git.commit(`docs: delete ${page.path}`, fileName, {
+ '--author': `"${page.authorName} <${page.authorEmail}>"`
+ })
+ }
},
/**
* RENAME
--
2.24.1