Skip to content

Commit

Permalink
fix: πŸ› only ignore files when .ultraignore file exists
Browse files Browse the repository at this point in the history
  • Loading branch information
folke committed Feb 27, 2021
1 parent 51be927 commit 6f39967
Showing 1 changed file with 6 additions and 8 deletions.
14 changes: 6 additions & 8 deletions src/git.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { exec } from "child_process"
import fs from "fs"
import path from "path"
import ignore, { Ignore } from "ignore"
import ignore from "ignore"
import { findUp } from "./package"
import { HASH_FILE } from "./options"

Expand All @@ -11,16 +11,14 @@ type GitFiles = Record<string, string>

export class NoGitError extends Error {}

function getUltraIgnore(root: string): Ignore {
function getUltraIgnore(root: string) {
const ultraIgnorePath = path.resolve(root, ".ultraignore")
const ultraIgnoreExists = fs.existsSync(ultraIgnorePath)

const ultraIgnore = ignore()
if (ultraIgnoreExists) {
if (fs.existsSync(ultraIgnorePath)) {
const ultraIgnore = ignore()
ultraIgnore.add(fs.readFileSync(ultraIgnorePath).toString())
return ultraIgnore
}

return ultraIgnore
}

export function parseFiles(data: string, root: string): GitFiles {
Expand Down Expand Up @@ -82,11 +80,11 @@ class FilesCache {
Object.entries(files)
.filter(([file]) => {
const filePath = path.resolve(root, file)
if (ultraIgnore && ultraIgnore.ignores(file)) return false

This comment has been minimized.

Copy link
@alexkrautmann

alexkrautmann Feb 27, 2021

Contributor

πŸ‘

return (
filePath == directory || filePath.startsWith(directory + path.sep)
)
})
.filter(([file]) => !ultraIgnore.ignores(file))
.map(([file, hash]) => [
path.relative(directory, path.resolve(root, file)),
hash,
Expand Down

0 comments on commit 6f39967

Please sign in to comment.