@dezkareid/osddt 1.11.4 → 1.11.5
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/dist/index.js +4 -9
- package/package.json +1 -1
package/dist/index.js
CHANGED
|
@@ -744,9 +744,7 @@ function findWorktreeByFeature(barePath, featureName) {
|
|
|
744
744
|
continue;
|
|
745
745
|
const worktreePath = match[1].trim();
|
|
746
746
|
const basename = path.basename(worktreePath);
|
|
747
|
-
|
|
748
|
-
const suffixMatch = segments.length > 1 && basename.slice(basename.indexOf('-') + 1) === featureName;
|
|
749
|
-
if (basename === featureName || suffixMatch) {
|
|
747
|
+
if (basename === featureName) {
|
|
750
748
|
return worktreePath;
|
|
751
749
|
}
|
|
752
750
|
}
|
|
@@ -1146,9 +1144,6 @@ function contextCommand() {
|
|
|
1146
1144
|
return cmd;
|
|
1147
1145
|
}
|
|
1148
1146
|
|
|
1149
|
-
function repoName(repoRoot) {
|
|
1150
|
-
return path.basename(repoRoot);
|
|
1151
|
-
}
|
|
1152
1147
|
function branchExists(branch, cwd) {
|
|
1153
1148
|
try {
|
|
1154
1149
|
execSync(`git rev-parse --verify ${branch}`, { cwd, stdio: 'ignore' });
|
|
@@ -1235,9 +1230,9 @@ async function runStartWorktree(featureName, options) {
|
|
|
1235
1230
|
console.log(` Working dir: ${workingDir}`);
|
|
1236
1231
|
return;
|
|
1237
1232
|
}
|
|
1238
|
-
// Resolve worktree path —
|
|
1239
|
-
const base = rc['worktreeBase'] ??
|
|
1240
|
-
const worktreePath = path.join(base,
|
|
1233
|
+
// Resolve worktree path — inside .bare as <barePath>/<featureName>
|
|
1234
|
+
const base = rc['worktreeBase'] ?? repoRoot;
|
|
1235
|
+
const worktreePath = path.join(base, featureName);
|
|
1241
1236
|
await createWorktree(branch, worktreePath, repoRoot);
|
|
1242
1237
|
// Resolve working dir
|
|
1243
1238
|
let projectPath;
|