Skip to content

fix: Gitignore incompatbility - #744

Merged
dmtrKovalenko merged 1 commit into
mainfrom
fix/gitignore-incompat
Aug 5, 2026
Merged

dmtrKovalenko merged 1 commit into
mainfrom
fix/gitignore-incompat

Conversation

@dmtrKovalenko

Copy link
Copy Markdown
Owner

Closes #723 fixed in zlob

Closes #723 fixed in zlob
@dmtrKovalenko
dmtrKovalenko merged commit 086044f into main Aug 5, 2026
52 checks passed
abhijit-s pushed a commit to abhijit-s/fff that referenced this pull request Aug 6, 2026
Upstream: empty-dir scan (dmtrKovalenko#735), gitignore fix (dmtrKovalenko#744), pi-fff aux dedup (dmtrKovalenko#750).

Conflict resolution:
- file_picker.rs: keep fork's ignore_globs/user_gi filter atop upstream's sort
- background_watcher.rs: merge fork's per-root ignore_globs/user_gi into
  upstream's walk_collect_files rewrite of index_new_directory (dmtrKovalenko#735); adopt
  upstream's clean Linux watch registration, dropping the fork's per-new-dir
  self-heal retry to avoid a picker->debouncer lock-order inversion. Primary
  self-heal (create_debouncer + coverage recheck) preserved.
abhijit-s pushed a commit to abhijit-s/fff that referenced this pull request Aug 10, 2026
First stable release since 0.17.2. Rolls up the fork's Linux APT delivery
pipeline, the worker bootstrap thundering-herd fix, the watcher lock-order
hardening, the macOS git-status staleness fix, and three upstream syncs —
empty-dir scan (dmtrKovalenko#735), gitignore fix (dmtrKovalenko#744), pi-fff dedup (dmtrKovalenko#750), and
rescan throttling for giant folders (dmtrKovalenko#751).
ChefGroep added a commit to GroepOnline/pi-tools-legacy-fork-20260818 that referenced this pull request Aug 18, 2026
Upstream advanced 32 commits past our fork point (dmtrKovalenko#744): features up to
v0.10.5 (config schema, global config, LMDB env pool, MCP fixes, oxlint/
oxfmt migration) are now folded in. The previous 6 fork commits are
consolidated into this single clean fork commit on top of upstream main.

Scope rename (@FF-Labs -> @GroepOnline) for the published packages:
- packages/pi-fff, packages/fff-bun, packages/fff-node package.json
  metadata (name, repository, homepage, bugs) now point at GroepOnline/
  pi-tools; pi-fff deps resolve to @GroepOnline SDKs.
- pi-fff source imports fixed to @groeponline/fff-node + @groeponline/
  fff-bun (published 0.10.2-nightly packages imported @FF-Labs while
  declaring @GroepOnline deps -> runtime-broken extension).
- fff-node getPackageDir() name check updated for the new scope.
- scripts/set-npm-version.mjs scope lists updated.
- Lockfiles regenerated (packages/bun.lock, packages/package-lock.json).
- @ff-labs/fff-bin-* platform packages intentionally stay upstream-scoped
  (not published from this fork).

CI adaptations:
- release.yaml: build+publish only on v* tags + workflow_dispatch (no
  push-to-main / PR), publishes only the @GroepOnline packages without
  npm --provenance, auth via NODE_AUTH_TOKEN secret.
- rust.yml/python.yml/external-tests.yml: Linux-only on push/PR, full
  3-OS matrix only on release tags.
- READMEs and issue templates reference @GroepOnline scope.
wpenistone pushed a commit to wpenistone/fffork that referenced this pull request Oct 13, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[Bug]: .gitignore regression in 0.10.x

1 participant