โ† All skills
Tencent SkillHub ยท Developer Tools

Unfuck My Git State

Diagnose and recover broken Git state and worktree metadata with a staged, low-risk recovery flow. Use when Git reports detached or contradictory HEAD state, phantom worktree locks, orphaned worktree entries, missing refs, 0000000000000000000000000000000000000000 hashes, or branch operations fail with errors like already checked out, unknown revision, not a valid object name, or cannot lock ref.

skill openclawclawhub Free
0 Downloads
0 Stars
0 Installs
0 Score
High Signal

Diagnose and recover broken Git state and worktree metadata with a staged, low-risk recovery flow. Use when Git reports detached or contradictory HEAD state, phantom worktree locks, orphaned worktree entries, missing refs, 0000000000000000000000000000000000000000 hashes, or branch operations fail with errors like already checked out, unknown revision, not a valid object name, or cannot lock ref.

โฌ‡ 0 downloads โ˜… 0 stars Unverified but indexed

Install for OpenClaw

Quick setup
  1. Download the package from Yavira.
  2. Extract the archive and review SKILL.md first.
  3. Import or place the package into your OpenClaw setup.

Requirements

Target platform
OpenClaw
Install method
Manual import
Extraction
Extract archive
Prerequisites
OpenClaw
Primary doc
SKILL.md

Package facts

Download mode
Yavira redirect
Package format
ZIP package
Source platform
Tencent SkillHub
What's included
README.md, SKILL.md, agents/openai.yaml, references/recovery-checklist.md, references/symptom-map.md, scripts/guided_repair_plan.sh

Validation

  • Use the Yavira download entry.
  • Review SKILL.md after the package is downloaded.
  • Confirm the extracted package contains the expected setup assets.

Install with your agent

Agent handoff

Hand the extracted package to your coding agent with a concrete install brief instead of figuring it out manually.

  1. Download the package from Yavira.
  2. Extract it into a folder your agent can access.
  3. Paste one of the prompts below and point your agent at the extracted folder.
New install

I downloaded a skill package from Yavira. Read SKILL.md from the extracted folder and install it by following the included instructions. Then review README.md for any prerequisites, environment setup, or post-install checks. Tell me what you changed and call out any manual steps you could not complete.

Upgrade existing

I downloaded an updated skill package from Yavira. Read SKILL.md from the extracted folder, compare it with my current installation, and upgrade it while preserving any custom configuration unless the package docs explicitly say otherwise. Then review README.md for any prerequisites, environment setup, or post-install checks. Summarize what changed and any follow-up checks I should run.

Trust & source

Release facts

Source
Tencent SkillHub
Verification
Indexed source record
Version
0.2.1

Documentation

ClawHub primary doc Primary doc: SKILL.md 13 sections Open source page

unfuck-my-git-state

Recover a repo without making the blast radius worse.

Core Rules

Snapshot first. Do not "just try stuff." Prefer non-destructive fixes before force operations. Treat .git/ as production data until backup is taken. Use git symbolic-ref before manually editing .git/HEAD. After each fix, run verification before proceeding.

Fast Workflow

Capture diagnostics: bash scripts/snapshot_git_state.sh . Route by symptom using references/symptom-map.md. Generate non-destructive command plan: bash scripts/guided_repair_plan.sh --repo . Apply the smallest matching playbook. Run references/recovery-checklist.md verification gate. Escalate only if the gate fails. For explicit routing: bash scripts/guided_repair_plan.sh --list bash scripts/guided_repair_plan.sh --symptom phantom-branch-lock

Regression Harness

Use disposable simulation tests before changing script logic: bash scripts/regression_harness.sh Run one scenario: bash scripts/regression_harness.sh --scenario orphaned-worktree

Playbook A: Orphaned Worktree Metadata

Symptoms: git worktree list shows a path that no longer exists. Worktree entries include invalid or zero hashes. Steps: git worktree list --porcelain git worktree prune -v git worktree list --porcelain If stale entries remain, back up .git/ and remove the specific stale folder under .git/worktrees/<name>, then rerun prune.

Playbook B: Phantom Branch Lock

Symptoms: git branch -d or git branch -D fails with "already used by worktree". git worktree list seems to disagree with branch ownership. Steps: git worktree list --porcelain Find the worktree using that branch, switch that worktree to another branch or detach HEAD there, then retry the branch operation in the main repo.

Playbook C: Detached or Contradictory HEAD

Symptoms: git status says detached HEAD unexpectedly. git branch --show-current and git symbolic-ref -q HEAD disagree. Steps: git symbolic-ref -q HEAD || true git reflog --date=iso -n 20 git switch <known-good-branch> If branch context is unknown, create a rescue branch from current commit: git switch -c rescue/$(date +%Y%m%d-%H%M%S) Then reconnect to the intended branch after investigation.

Playbook D: Missing or Broken Refs

Symptoms: unknown revision, not a valid object name, or cannot lock ref. Steps: git fetch --all --prune git show-ref --verify refs/remotes/origin/<branch> git branch -f <branch> origin/<branch> git switch <branch> Use reflog to recover local-only commits before forcing branch pointers.

Last Resort: Manual HEAD Repair

Only after backup of .git/. Preferred: git show-ref --verify refs/heads/<branch> git symbolic-ref HEAD refs/heads/<branch> Fallback when symbolic-ref cannot be used: echo "ref: refs/heads/<branch>" > .git/HEAD Immediately run the verification gate.

Verification Gate (Must Pass)

Run checks in references/recovery-checklist.md. Minimum bar: git status exits cleanly with no fatal errors. git symbolic-ref -q HEAD matches intended branch. git worktree list --porcelain has no missing paths and no zero hashes. git fsck --no-reflogs --full has no new critical errors.

Escalation Path

Archive .git: tar -czf git-metadata-backup-$(date +%Y%m%d-%H%M%S).tar.gz .git Clone fresh from remote. Recover unpushed work with reflog and cherry-pick from old clone. Document failure mode and add guardrails to automation.

Automation Hooks

When building worktree tooling (iMi, scripts, bots), enforce: preflight snapshot and state validation post-operation verification gate hard stop on HEAD/ref inconsistency explicit user confirmation before destructive commands

Resources

Symptom router: references/symptom-map.md Verification checklist: references/recovery-checklist.md Diagnostic snapshot script: scripts/snapshot_git_state.sh Guided plan generator: scripts/guided_repair_plan.sh Disposable regression harness: scripts/regression_harness.sh

Category context

Code helpers, APIs, CLIs, browser automation, testing, and developer operations.

Source: Tencent SkillHub

Largest current source with strong distribution and engagement signals.

Package contents

Included in package
4 Docs1 Scripts1 Config
  • SKILL.md Primary doc
  • README.md Docs
  • references/recovery-checklist.md Docs
  • references/symptom-map.md Docs
  • scripts/guided_repair_plan.sh Scripts
  • agents/openai.yaml Config