diff --git a/src/git/models/models.ts b/src/git/models/models.ts index ea47113..7ee3243 100644 --- a/src/git/models/models.ts +++ b/src/git/models/models.ts @@ -1,7 +1,7 @@ 'use strict'; import { GitBranch } from './branch'; -import { Container } from '../../container'; import { GlyphChars } from '../../constants'; +import { Container } from '../../container'; const emptyStr = ''; @@ -266,12 +266,12 @@ export namespace GitReference { switch (ref.refType) { case 'branch': result = `${options.label ? `${ref.remote ? 'remote ' : ''}branch ` : ''}${ - options.icon ? `$(git-branch) ${ref.name}${GlyphChars.Space}` : ref.name + options.icon ? `$(git-branch)${GlyphChars.Space}${ref.name}${GlyphChars.Space}` : ref.name }`; break; case 'tag': result = `${options.label ? 'tag ' : ''}${ - options.icon ? `$(tag) ${ref.name}${GlyphChars.Space}` : ref.name + options.icon ? `$(tag)${GlyphChars.Space}${ref.name}${GlyphChars.Space}` : ref.name }`; break; default: { @@ -287,7 +287,7 @@ export namespace GitReference { result = `${options.label ? 'stash ' : ''}${ options.icon - ? `$(archive) ${message ?? ref.name}${GlyphChars.Space}` + ? `$(archive)${GlyphChars.Space}${message ?? ref.name}${GlyphChars.Space}` : `${message ?? ref.number ?? ref.name}` }`; } else if (GitRevision.isRange(ref.ref)) { @@ -313,7 +313,7 @@ export namespace GitReference { result = `${options.label ? `${prefix}commit ` : ''}${ options.icon - ? `$(git-commit) ${name}${message ?? ''}${GlyphChars.Space}` + ? `$(git-commit)${GlyphChars.Space}${name}${message ?? ''}${GlyphChars.Space}` : `${name}${message ?? ''}` }`; } @@ -350,9 +350,9 @@ export * from './issue'; export * from './log'; export * from './logCommit'; export * from './pullRequest'; +export * from './reflog'; export * from './remote'; export * from './repository'; -export * from './reflog'; export * from './shortlog'; export * from './stash'; export * from './stashCommit';