Skip to content

Fix branch pulls for detached primary workspaces #696

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chubes4 merged 1 commit into from
Jun 14, 2026
Merged

Fix branch pulls for detached primary workspaces #696

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion inc/Abilities/WorkspaceAbilities.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -841,6 +841,14 @@ private function registerAbilities(): void {
'type' => 'boolean',
'description' => 'Permit mutation on the primary checkout (default false). Worktrees are always allowed.',
),
'remote' => array(
'type' => 'string',
'description' => 'Remote name for pull when branch is supplied (default origin).',
),
'branch' => array(
'type' => 'string',
'description' => 'Remote branch to pull. Useful when the checkout is detached.',
),
),
'required' => array( 'name' ),
),
Expand Down Expand Up @@ -2991,7 +2999,9 @@ public static function gitPull( array $input ): array|\WP_Error {
return $workspace->git_pull(
$input['name'] ?? '',
! empty($input['allow_dirty']),
! empty($input['allow_primary_mutation'])
! empty($input['allow_primary_mutation']),
(string) ( $input['remote'] ?? 'origin' ),
isset($input['branch']) ? (string) $input['branch'] : null
);
}

Expand Down
8 changes: 6 additions & 2 deletions inc/Cli/Commands/WorkspaceCommand.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2554,10 +2554,10 @@ private function resolveAtFile( string $value ): string {
* : Permit mutating ops (pull/add/commit/push) on the primary checkout. Default-deny — use a worktree handle (`<repo>@<branch-slug>`) instead whenever possible.
*
* [--remote=<remote>]
* : Remote name for push (default: origin).
* : Remote name for pull/push (default: origin).
*
* [--branch=<branch>]
* : Branch override for push.
* : Branch override for pull/push. For pull, supplies an explicit remote branch when the checkout is detached.
*
* [--from=<ref>]
* : From ref for diff.
Expand Down Expand Up @@ -2640,6 +2640,10 @@ public function git( array $args, array $assoc_args ): void {

if ( 'pull' === $operation ) {
$input['allow_dirty'] = ! empty($assoc_args['allow-dirty']);
$input['remote'] = $assoc_args['remote'] ?? 'origin';
if ( ! empty($assoc_args['branch']) ) {
$input['branch'] = (string) $assoc_args['branch'];
}
}

if ( 'add' === $operation ) {
Expand Down
15 changes: 13 additions & 2 deletions inc/Workspace/WorkspaceGitOperations.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ public function git_status( string $handle ): array|\WP_Error {
* @param bool $allow_dirty Allow pull with dirty working tree.
* @return array
*/
public function git_pull( string $handle, bool $allow_dirty = false, bool $allow_primary_mutation = false ): array|\WP_Error {
public function git_pull( string $handle, bool $allow_dirty = false, bool $allow_primary_mutation = false, string $remote = 'origin', ?string $branch = null ): array|\WP_Error {
if ( WorkspaceAliasResolver::is_context_repository($handle) ) {
return WorkspaceAliasResolver::mutation_error($handle, 'git pull');
}
Expand Down Expand Up @@ -107,7 +107,18 @@ public function git_pull( string $handle, bool $allow_dirty = false, bool $allow
return new \WP_Error('dirty_working_tree', 'Working tree is dirty. Commit/stash changes first or pass allow_dirty=true.', array( 'status' => 400 ));
}

$result = $this->run_git($repo_path, 'pull --ff-only');
$remote = trim($remote);
$branch = null !== $branch ? trim($branch) : null;
if ( '' === $remote ) {
$remote = 'origin';
}

$command = 'pull --ff-only';
if ( null !== $branch && '' !== $branch ) {
$command .= ' ' . escapeshellarg($remote) . ' ' . escapeshellarg($branch);
}

$result = $this->run_git($repo_path, $command);

if ( is_wp_error($result) ) {
return $result;
Expand Down
Loading