jettypod 4.4.59 → 4.4.60
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.
|
@@ -137,12 +137,13 @@ function evaluateBashCommand(command, currentBranch, cwd) {
|
|
|
137
137
|
}
|
|
138
138
|
|
|
139
139
|
// BLOCKED: Merge from inside worktree (causes CWD corruption)
|
|
140
|
-
|
|
140
|
+
// Matches: jettypod work merge, jettypod work tests merge
|
|
141
|
+
if (/jettypod\s+work\s+(tests\s+)?merge/.test(command)) {
|
|
141
142
|
if (cwd && /\.jettypod-work\//.test(cwd)) {
|
|
142
143
|
return {
|
|
143
144
|
allowed: false,
|
|
144
|
-
message: 'Cannot merge from inside a worktree
|
|
145
|
-
hint: '
|
|
145
|
+
message: 'Cannot merge from inside a worktree - your shell CWD would be deleted, corrupting the session.',
|
|
146
|
+
hint: 'First run: cd <main-repo-path>\nThen retry the merge command.'
|
|
146
147
|
};
|
|
147
148
|
}
|
|
148
149
|
}
|