@miller-tech/uap 1.147.0 → 1.147.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json
CHANGED
|
Binary file
|
|
@@ -24,7 +24,7 @@ import sys
|
|
|
24
24
|
from pathlib import Path
|
|
25
25
|
|
|
26
26
|
sys.path.insert(0, str(Path(__file__).parent))
|
|
27
|
-
from _common import emit, parse_cli,
|
|
27
|
+
from _common import emit, parse_cli, worktree_root, run # noqa: E402
|
|
28
28
|
|
|
29
29
|
# Ship verbs are anchored to their tool prefix so that the bare tokens "merge"
|
|
30
30
|
# or "signoff" inside read-only commands (git diff --merge-base, rg merge,
|
|
@@ -132,7 +132,11 @@ def main() -> None:
|
|
|
132
132
|
if not any(p.search(cmd) for p in SHIP_PATTERNS):
|
|
133
133
|
emit(True, "not a ship action")
|
|
134
134
|
|
|
135
|
-
|
|
135
|
+
# Resolve against the WORKING TREE the operation runs in (the worktree when a
|
|
136
|
+
# ship op runs from inside one), NOT the main checkout. repo_root() is pinned
|
|
137
|
+
# to MAIN_ROOT by the gate, so it always read the main checkout's branch and
|
|
138
|
+
# demanded a review for the wrong branch on every worktree commit/push.
|
|
139
|
+
root = worktree_root()
|
|
136
140
|
branch = current_branch(root)
|
|
137
141
|
if branch is None:
|
|
138
142
|
emit(True, "branch not resolvable (detached/non-git) — fail-open")
|