Skip to content

fix: resolve branch upstream in shallow clones via git config fallback #304980

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

Open
yogeshwaran-c wants to merge 1 commit into
base: main
Choose a base branch
from
+19 −0
Open

fix: resolve branch upstream in shallow clones via git config fallback #304980

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
19 changes: 19 additions & 0 deletions extensions/git/src/git.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3211,6 +3211,25 @@ export class Repository {
} catch { }
}

// Fallback for shallow clones: for-each-ref returns empty upstream
// fields, so we read the branch tracking config directly
if (!branch.upstream && branch.type === RefType.Head && branch.name) {
try {
const remoteResult = await this.exec(['config', '--get', `branch.${branch.name}.remote`]);
const mergeResult = await this.exec(['config', '--get', `branch.${branch.name}.merge`]);

const remote = remoteResult.stdout.trim();
const merge = mergeResult.stdout.trim();

if (remote && merge) {
const upstreamName = merge.startsWith('refs/heads/') ? merge.substring(11) : merge;
(branch as Mutable<Branch>).upstream = { remote, name: upstreamName };
}
} catch {
// No tracking config found, upstream remains undefined
}
}

return branch;
}

Expand Down