Skip to content

gitignore: local per-machine root files - #2122

Open
DassaultFalconKing wants to merge 1 commit into
Niko1221:mainfrom
DassaultFalconKing:gitignore-local-configs
Open

DassaultFalconKing wants to merge 1 commit into
Niko1221:mainfrom
DassaultFalconKing:gitignore-local-configs

Conversation

@DassaultFalconKing

Copy link
Copy Markdown

Root-anchored ignores for local client configs, launch helpers and server logs (.out, claude-.sh, mode-.sh, mcp..json, opencode.work.jsonc), so they never block update.sh's git pull --ff-only. Opt-in, default path untouched; committed bench/results/**/*.out stay tracked.

…rs, server logs)

Root-anchored patterns only, so committed bench/results/**/*.out
community benchmarks stay tracked. Keeps update.sh's git pull
--ff-only from tripping over untracked local files.
@qiuzan2001

Copy link
Copy Markdown

The stated reason does not hold, and ignoring has a side effect. Untracked files never block git pull --ff-only unless upstream adds the same path, and update.sh:23 / UPDATE.bat:31 already count only tracked changes (--untracked-files=no). When upstream does add such a path, git refuses to overwrite an untracked file but silently overwrites an ignored one: in a scratch repo with /mode-*.sh ignored, a local mode-x.sh was replaced by upstream's on git pull --ff-only ("after pull: upstream"); without the ignore, git stops and asks to move it. The names (claude-*.sh, mode-*.sh, mcp.*.json, opencode.work.jsonc) also describe one machine's setup; .git/info/exclude or a global gitignore keeps them out of git status without changing the repo.

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.

2 participants