Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-27 20:13:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Git - gif config should not throw if key does not exist (#200358)

Browse Source
This commit is contained in:
Ladislau Szomoru
2023-12-08 15:10:52 +01:00
committed by GitHub
parent 2018d1523e
commit b0b6913211
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
extensions/git/src/repository.ts
View File

@@ -1474,8 +1474,9 @@ export class Repository implements Disposable {
// Git config
try {
const mergeBase = await this.getConfig(branchMergeBaseConfigKey);
if (mergeBase) {
return await this.getBranch(mergeBase);
if (mergeBase !== '') {
const mergeBaseBranch = await this.getBranch(mergeBase);
return mergeBaseBranch;
}
} catch (err) { }