Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions .changeset/fix-head-named-remote-branches.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"task-master-ai": patch
---

Preserve remote branches whose names contain HEAD when listing branches. Only the remote HEAD reference is excluded.
62 changes: 62 additions & 0 deletions packages/tm-core/src/common/utils/git-utils.spec.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
import { beforeEach, describe, expect, it, vi } from 'vitest';
import { getRemoteBranches } from './git-utils.js';

const { execAsync } = vi.hoisted(() => ({ execAsync: vi.fn() }));

vi.mock('util', () => ({ promisify: () => execAsync }));

describe('getRemoteBranches', () => {
beforeEach(() => {
execAsync.mockReset();
});

it('preserves branch names containing HEAD', async () => {
execAsync.mockResolvedValue({
stdout: 'origin/fix/HEAD-request\norigin/HEAD-fix\norigin/feature/HEAD\n'
});

await expect(getRemoteBranches('/project')).resolves.toEqual([
'fix/HEAD-request',
'HEAD-fix',
'feature/HEAD'
]);
});

it('preserves branches whose remote name contains HEAD', async () => {
execAsync.mockResolvedValue({ stdout: 'HEADquarters/main\n' });

await expect(getRemoteBranches('/project')).resolves.toEqual(['main']);
});

it('excludes remote HEAD references', async () => {
execAsync.mockResolvedValue({
stdout: 'origin/HEAD\r\nupstream/HEAD\r\norigin/main\r\n'
});

await expect(getRemoteBranches('/project')).resolves.toEqual(['main']);
});

it('deduplicates branches and ignores empty lines', async () => {
execAsync.mockResolvedValue({
stdout: '\norigin/main\nupstream/main\n\norigin/feature/test\n'
});

await expect(getRemoteBranches('/project')).resolves.toEqual([
'main',
'feature/test'
]);
});

it('returns an empty list when git fails', async () => {
execAsync.mockRejectedValue(new Error('not a git repository'));

await expect(getRemoteBranches('/project')).resolves.toEqual([]);
});

it('requires a project root without running git', async () => {
await expect(getRemoteBranches('')).rejects.toThrow(
'projectRoot is required for getRemoteBranches'
);
expect(execAsync).not.toHaveBeenCalled();
});
});
4 changes: 2 additions & 2 deletions packages/tm-core/src/common/utils/git-utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -132,8 +132,8 @@ export async function getRemoteBranches(
const names = stdout
.trim()
.split('\n')
.filter((branch) => branch.length > 0 && !branch.includes('HEAD'))
.map((branch) => branch.replace(/^[^/]+\//, '').trim());
.map((branch) => branch.replace(/^[^/]+\//, '').trim())
.filter((branch) => branch.length > 0 && branch !== 'HEAD');
return Array.from(new Set(names));
} catch (error) {
return [];
Expand Down