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>

fix: don't push files to git if ignored (#5334)
e3d94f71 · El Gato da Great · GitHub · 7f1988cd · e3d94f71
Unverified Commit e3d94f71 authored May 26, 2022 by El Gato da Great Committed by GitHub May 26, 2022
Hide whitespace changes
Inline Side-by-side

Showing with 21 additions and 12 deletions

storage.js server/modules/storage/git/storage.js +21 -12

No files found.
--- 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