From 5196ac5db8c7dcf4385035e563eb8ab754405273 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hern=C3=A2ni=20Marques?= Date: Wed, 9 Sep 2026 01:31:47 +0200 Subject: [PATCH] ops: Forgejo tip=master unify + silverbucket rename note --- 2026/2026-09-09--forgejo-tip-master-only.md | 31 +++++++++++++++++++++ ops/local-branches-sync.md | 4 +-- 2 files changed, 33 insertions(+), 2 deletions(-) create mode 100644 2026/2026-09-09--forgejo-tip-master-only.md diff --git a/2026/2026-09-09--forgejo-tip-master-only.md b/2026/2026-09-09--forgejo-tip-master-only.md new file mode 100644 index 0000000..e8c54f6 --- /dev/null +++ b/2026/2026-09-09--forgejo-tip-master-only.md @@ -0,0 +1,31 @@ +# Forgejo HT tip = `master` only (2026-09-09) + +## Rule + +On `git.hacktivism.ch` every hernani tip is **`master` only** — no dual `main`+`master`, no tip named `main`. + +- Instance: `[repository] DEFAULT_BRANCH = master` in Forgejo `app.ini` (live after container restart). +- Sync/clone/push defaults: `origin/master`. +- Docs: `llm-configs` → `git-skills.md`, `ESYNC-RULE.md`, `REPOS-INDEX.md`, `forgejo-llm-config.md`. + +## Unify (done) + +Authenticated inventory: 32 hernani repos. Mutated 15 NEED → verify **OK 32 / BAD 0**. + +Notable: + +| Case | Repos | +|------|--------| +| MAIN_ONLY → master + drop main | `_grok_sync`, admin-logs, `elelmon` (kept `main-legacy`), `silverbucket` (ex-`freenotes` space), `grok-work-log`, `llm-work-output-enc`, `openkknd-ng`, `taler-monitoring`, `taler-wallets-enc`, `vecirex-www`, … | +| EMPTY | `vecigate-admin-log` (PATCH default only) | +| DUAL_DIFF (stale master dropped; tip from former main) | `git`, `llm-configs` | + +Feature branches left in place where present (`koopa-admin-log`, `taler-monitoring`, …). + +## Rename (same day) + +Forgejo space repo **`hernani/freenotes` → `hernani/silverbucket`** (tip `master`). Local clone: `~/git/freenotes-space` → origin `silverbucket`. **Not** the FreeNotes tool/apps tree (`~/git/freenotes`). + +## Local clones + +Retarget checkout/tracking to `origin/master` on magikoopa trees that had `origin`. diff --git a/ops/local-branches-sync.md b/ops/local-branches-sync.md index 60be734..0af0ea4 100644 --- a/ops/local-branches-sync.md +++ b/ops/local-branches-sync.md @@ -1,6 +1,6 @@ # Local-only copy — /home/hernani/koopa-admin-log # -# main → Forgejo origin (ok to push) +# master → Forgejo origin (ok to push) # local/* → NEVER push to origin; sync only via home/bundle between kisten # # Branches: @@ -15,7 +15,7 @@ # cd /home/hernani/koopa-admin-log && git fetch /tmp/koopa-local.bundle "+refs/heads/local/*:refs/heads/local/*" # # Pull main: -# git fetch origin && git checkout main && git merge --ff-only origin/main +# git fetch origin && git checkout master && git merge --ff-only origin/master ## 2026-07-17 clone merge