Skip to content

Commit a55106d

Browse files
author
Developer
committed
fix: strip URL from gh issue develop output, improve worktree naming
- gh issue develop --list outputs tab-separated branch+URL; parse only branch name - PR default name now pr-{number} instead of slugified branch - Prompt hint shows resulting folder name for clarity
1 parent 9643891 commit a55106d

File tree

1 file changed

+9
-4
lines changed

1 file changed

+9
-4
lines changed

src/Commands/WorktreeCreateCommand.php

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public function handle(WorktreeManager $worktreeManager): int
6464
return self::FAILURE;
6565
}
6666
$branch = $resolved;
67-
$name ??= $this->slugifyBranch($resolved);
67+
$name ??= "pr-{$pr}";
6868
}
6969

7070
// Derive name from --branch when no positional name
@@ -244,7 +244,7 @@ private function promptPullRequest(): array
244244
);
245245

246246
$branch = $prData[$prNumber];
247-
$defaultName = $this->slugifyBranch($branch);
247+
$defaultName = "pr-{$prNumber}";
248248

249249
return [$defaultName, $branch];
250250
}
@@ -295,6 +295,8 @@ private function promptBranch(): array
295295

296296
private function promptName(string $default): string
297297
{
298+
$projectName = basename(base_path());
299+
298300
return text(
299301
label: 'Worktree name',
300302
placeholder: 'e.g. 123-add-auth',
@@ -307,7 +309,7 @@ private function promptName(string $default): string
307309

308310
return null;
309311
},
310-
hint: 'Alphanumeric and hyphens only.',
312+
hint: $default !== '' ? "Folder: {$projectName}-{$default}" : "Folder: {$projectName}-{name}",
311313
);
312314
}
313315

@@ -324,7 +326,10 @@ private function resolveIssueBranch(int $issueNumber): ?string
324326
return null;
325327
}
326328

327-
$branches = array_filter(array_map(trim(...), explode("\n", trim($result->output()))));
329+
$branches = array_filter(array_map(function (string $line): string {
330+
// gh issue develop --list outputs "branch\tURL" — take only the branch name
331+
return trim(explode("\t", trim($line))[0]);
332+
}, explode("\n", trim($result->output()))));
328333

329334
if ($branches !== []) {
330335
$branch = $branches[0];

0 commit comments

Comments
 (0)