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

💄

Browse Source
This commit is contained in:
al
2019-09-08 22:40:11 +03:00
parent 4b90d9ba82
commit 4afe989cfa
2 changed files with 23 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1653,7 +1653,7 @@ export class Repository implements Disposable {
}
private updateInputBoxPlaceholder(): void {
const branchName = this.getBranchName();
const branchName = getBranchName(this.HEAD, this.refs);
if (branchName) {
// '{0}' will be replaced by the corresponding key-command later in the process, which is why it needs to stay.
@@ -1663,17 +1663,20 @@ export class Repository implements Disposable {
}
}
getBranchName(): string | undefined {
const HEAD = this.HEAD;
if (HEAD === undefined) {
return;
}
const tag = this.refs.filter(iref => iref.type === RefType.Tag && iref.commit === HEAD.commit)[0];
const tagName = tag && tag.name;
return HEAD.name || tagName || (HEAD.commit || '').substr(0, 8);
}
dispose(): void {
this.disposables = dispose(this.disposables);
}
}
export function getBranchName(HEAD: Repository['HEAD'], refs: Repository['refs']): string | undefined {
if (!HEAD) {
return;
}
const tag = refs.filter(iref => iref.type === RefType.Tag && iref.commit === HEAD.commit)[0];
const tagName = tag && tag.name;
const branchName = HEAD.name || tagName || HEAD.commit;
if (!branchName) {
return;
}
return branchName.substr(0, 8);
}