Git

Use git worktree for a clean hotfix without stashing active work

The Tryssh team ·

For Git worktree hotfix, begin by proving which system and state you are about to affect. A linked worktree checks out another branch into a separate directory while sharing repository objects and most refs. The safest useful answer is therefore an evidence sequence: identify the target, capture its effective state, make one bounded change, and verify through a path independent of the command that accepted the change.

TL;DR: The hotfix starts from reviewed main in an isolated directory and the original worktree remains untouched. Start with git status --short, stop if the evidence instead shows that the target path contains files, the branch is already checked out elsewhere, or shared hooks and config differ, and keep this recovery action ready: commit or copy intended work, run git worktree remove on the exact candidate path, then prune stale metadata.

Assumed audience: developers and release operators who understand commits, refs, the index, remotes, and the difference between published and local history. This field guide assumes a controlled maintenance window and working recovery access.

Use git worktree for a clean hotfix without stashing active work identity, evidence, action, and proof map

Direct answer and success condition

The success condition for Git worktree hotfix is not a zero exit code. It is that the hotfix starts from reviewed main in an isolated directory and the original worktree remains untouched. A command may return successfully while a controller is still converging, a client is using cached state, a remote dependency is unavailable, or the wrong account, namespace, region, host, database, repository, or process accepted the request.

Use the task boundary—working tree, index, local objects, refs and reflogs, remote refs, signatures, and collaborator-visible history—to decide what the result proves. The candidate action belongs only at the first layer whose observed state contradicts the desired outcome. If the baseline cannot locate that contradiction, do not make the action broader.

Working model

For Git recovery and maintenance, use this operational model: Git stores immutable objects and moves references between commits; the working tree and index are projections, while reflogs and reachability determine which local history can still be recovered. This model matters for Git worktree hotfix because a linked worktree checks out another branch into a separate directory while sharing repository objects and most refs. It also separates four forms of evidence that are often collapsed:

  1. Declared state: files, manifests, playbooks, policies, arguments, or API requests say what should happen.
  2. Effective state: the running tool or service reports what it actually loaded and selected.
  3. Resource state: processes, objects, data, network paths, and queues reflect the change.
  4. Outcome state: the original user, automation, or recovery workflow succeeds from the relevant vantage point.

Declared state without effective state is only intent. Effective state without outcome state is only partial convergence. Keep these labels in the change record so another operator can tell what was measured.

Preflight: identity, scope, and recovery

Create a recovery branch or bundle, inspect the exact object IDs, and avoid rewriting shared history until every affected collaborator and automation consumer is accounted for.

Record the current UTC time, operator identity, tool version, exact target identifiers, last successful execution, recent related changes, and the owner of the workload. Save the effective configuration or object state using its supported read-only interface. Do not store credentials, complete environment dumps, private customer data, or unrestricted topology in the ticket.

The recovery path for this guide is explicit: commit or copy intended work, run git worktree remove on the exact candidate path, then prune stale metadata. Rehearse the targeting syntax and confirm that recovery does not depend on the same account, network path, key, state file, database, repository, or process being changed.

Stop before changing state when any of these statements is true:

  • The target can be selected by a default or ambiguous alias.
  • The current configuration or binding cannot be reconstructed.
  • The only privileged or remote session would be put at risk.
  • The command affects an unbounded host, key, object, snapshot, branch, or resource set.
  • The expected output cannot be distinguished from stale, cached, or partial state.

Capture the baseline

Run the following commands individually after replacing example identifiers deliberately:

git status --short
git worktree list --porcelain
git branch --show-current

For Git worktree hotfix, classify the output before proposing a fix:

  • Expected evidence: the hotfix starts from reviewed main in an isolated directory and the original worktree remains untouched.
  • Abnormal evidence: the target path contains files, the branch is already checked out elsewhere, or shared hooks and config differ.
  • Inconclusive evidence: no output, permission errors, incomplete history, disabled instrumentation, a different version, or a different control plane can all hide the relevant state. Confirm those assumptions rather than translating absence into health.

Preserve timestamps and exit statuses for decisive observations. Prefer machine-readable output when it can be filtered without collecting secrets. Compare a healthy peer only by equivalent effective fields; copying its entire configuration can introduce a second problem.

Controlled action

This is state-changing example syntax. It is intentionally presented after the baseline and must not be pasted with example targets:

git worktree add ../repo-hotfix -b hotfix/urgent origin/main

The action is justified only if the baseline predicts its effect at the named boundary. For Git worktree hotfix, the principal risk is that removing a worktree directory manually can leave administrative metadata and untracked hotfix files behind. Review the exact expansion of variables, globs, resource addresses, inventory patterns, database identities, repository locations, and cloud regions before approval.

Prefer a canary, dry run, saved plan, isolated restore, configuration validator, transaction, immutable artifact, or runtime drain when the platform supplies one. Record the command, approver, UTC time, and expected convergence interval. Do not stack unrelated cleanup, restart, permission, and configuration actions into the same observation window.

Independent verification

Repeat the state inspection and then exercise the original path:

git -C ../repo-hotfix status --short
git worktree list --porcelain
git -C ../repo-hotfix log -1 --oneline

Verification for Git worktree hotfix must answer five questions:

  1. Did the intended identity accept the operation?
  2. Did effective state converge to the reviewed value?
  3. Did the underlying resource or data path change as predicted?
  4. Did the real consumer succeed from an independent vantage point?
  5. Did adjacent safety signals—capacity, latency, errors, replication, audit, or persistence—remain healthy?

If git -C ../repo-hotfix status --short passes but the consumer still fails, the local boundary may be repaired while another layer remains broken. Keep the new evidence, stop making the change broader, and move to the next falsifiable boundary.

Decision branches

The baseline contradicts the guide

If the target path contains files, the branch is already checked out elsewhere, or shared hooks and config differ, the candidate action no longer follows from the evidence. Re-establish identity and scope, shorten the observation window, and formulate a mechanism that the next read-only command can disprove.

The command succeeds but nothing converges

A successful git worktree add ../repo-hotfix -b hotfix/urgent origin/main proves only that one interface accepted the request. It may not prove persistence, controller completion, process reload, data compatibility, replication, traffic admission, or client refresh. Inspect those transitions in order.

The change makes the outcome worse

Execute the prepared recovery: commit or copy intended work, run git worktree remove on the exact candidate path, then prune stale metadata. Preserve the failed candidate, event times, and relevant logs. Avoid repeated restarts, broad resets, garbage collection, pruning, history rewriting, or cleanup that can erase the evidence needed to explain the failure.

The result is mixed

Mixed results normally mean scope differs across hosts, workers, replicas, zones, clients, branches, or repositories. Partition the evidence by identity instead of averaging it. Hold further rollout until each partition has an explicit disposition.

Review checklist

  • Confirm the operator, account, region, namespace, host, resource, repository, database, or branch.
  • Print the installed tool version and resolve the effective configuration.
  • Capture the baseline and name one observation that would disprove the proposed mechanism.
  • Mark git worktree add ../repo-hotfix -b hotfix/urgent origin/main as state-changing in review.
  • Keep recovery access independent and test the exact rollback target.
  • Change one layer and wait for its documented convergence boundary.
  • Repeat the original user or automation path, not only the control-plane query.
  • Watch error rate, latency, capacity, data durability, audit, and persistence after the change.
  • Remove temporary credentials, traces, restored data, debug settings, and candidate resources under policy.
  • Update this field guide when observed behavior differs from the source-reviewed model.

Investigate it in Tryssh

Tryssh keeps the target, read-only evidence, approval boundary, command output, and recovery decision in one host conversation.

Tryssh can help preserve this evidence trail and place a state-changing command behind human approval. It cannot decide the correct production target, authorize a cloud or database change, guarantee backup completeness, or replace independent recovery access.

Evidence and review status

This Git worktree hotfix field guide was source-reviewed on 2026-07-29 against current upstream or first-party documentation. Commands use example identifiers and were not executed against every distribution, service version, provider, database topology, repository backend, network, or workload. Provider-managed services may expose a different control plane or restrict local commands.

The article makes no ranking guarantee and does not treat documentation review as reproduction. Validate installed versions, permissions, feature support, recovery behavior, and billing or data-retention consequences in your environment.

Limitations and trade-offs

Removing a worktree directory manually can leave administrative metadata and untracked hotfix files behind. A narrow safe action may take longer than a broad reset, and a strong verification plan may require temporary capacity or an isolated restore target. Those costs are part of reliable operations, not optional ceremony.

Do not use a search result as authority to change production. The live system, reviewed policy, upstream versioned documentation, and accountable operator remain the sources of truth.

Continue the cluster

Next, read git bisect regression or Git interactive rebase. For broader context, use the Git recovery and maintenance foundation guide and the SSH hardening checklist.

Sources and further reading