mirror of
https://github.com/kellymichels/zscripts-token-savers
synced 2026-10-07 07:18:18 +00:00
e3ca10f2e3
Two commands that were private-only until now. They turned out to be useful
beyond the fleet they were written for, so they are manifested for publication
and removed from the sanitization denylist's private-only list.
zmerge merge every pull request across the org that is genuinely ready -
MERGEABLE/CLEAN and not a draft - re-checking each one immediately
before and after every merge, because merging into a default branch
can conflict a sibling PR in the same repository. Dry run by
default; -Execute or -e merges.
zpull zmerge, then git pull --ff-only in every checkout the merges
affected. Skips a checkout that is dirty or is not on its default
branch rather than guessing at it.
WHY THEY COULD BE PUBLISHED NOW. zmerge carried a hardcoded list of sixteen
repository names, which was both the reason it could not be published and a
bug: the org has thirty active repositories, so it scanned about half and
reported "Nothing open to merge" while a ready pull request sat in one it had
never heard of. It asks GitHub now, and the names went with the list.
Get-FleetRepos throws rather than returning an empty list when gh fails,
because a tool that quietly scans nothing prints the same reassuring line as
one that scanned everything and found nothing.
-e is an alias for -Execute on both, the way -s already works for -Scan.
Also: __pycache__/ is gitignored. scripts/plaintext_twins.py creates it on
every run and it was showing up as untracked work.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
25 lines
481 B
Plaintext
25 lines
481 B
Plaintext
# Local config — contains secrets (EC2 IP, SSH key path, local paths)
|
|
zconfig.json
|
|
|
|
# Legacy deploy config (superseded by zconfig.json)
|
|
zdeploy.config.json
|
|
|
|
# Temp zips from deploy (if a temp/ ever lands inside this folder)
|
|
temp/
|
|
|
|
# OS / editor
|
|
.DS_Store
|
|
Thumbs.db
|
|
desktop.ini
|
|
.idea/
|
|
.vscode/
|
|
|
|
# Internal working notes (superseded by TOKEN_SAVINGS.md)
|
|
md/
|
|
|
|
# Pester coverage output (regenerated; never committed)
|
|
coverage/
|
|
|
|
# Generated by scripts/plaintext_twins.py
|
|
__pycache__/
|