Git - fix remote reference id (microsoft#228164)

* Git - fix remote reference id * Remove unnecessary code
Progressive-Insurance · Sep 10, 2024 · 0485695 · 0485695
1 parent 8010aa6
commit 0485695
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/extensions/git/src/historyProvider.ts b/extensions/git/src/historyProvider.ts
@@ -16,7 +16,7 @@ function toSourceControlHistoryItemRef(ref: Ref): SourceControlHistoryItemRef {
  switch (ref.type) {
  case RefType.RemoteHead:
  return {
- id: `refs/remotes/${ref.remote}/${ref.name}`,
+ id: `refs/remotes/${ref.name}`,
  name: ref.name ?? '',
  description: ref.commit ? l10n.t('Remote branch at {0}', ref.commit.substring(0, 8)) : undefined,
  revision: ref.commit,

diff --git a/src/vs/workbench/contrib/scm/browser/scmHistoryViewPane.ts b/src/vs/workbench/contrib/scm/browser/scmHistoryViewPane.ts
@@ -52,7 +52,6 @@ import { ContextKeys } from './scmViewPane.js';
 import { IActionViewItem } from '../../../../base/browser/ui/actionbar/actionbar.js';
 import { IDropdownMenuActionViewItemOptions } from '../../../../base/browser/ui/dropdown/dropdownActionViewItem.js';
 import { ActionViewItem } from '../../../../base/browser/ui/actionbar/actionViewItems.js';
-import { renderLabelWithIcons } from '../../../../base/browser/ui/iconLabel/iconLabels.js';
 import { IQuickInputService, IQuickPickItem, IQuickPickSeparator } from '../../../../platform/quickinput/common/quickInput.js';
 import { Event } from '../../../../base/common/event.js';
 import { Iterable } from '../../../../base/common/iterator.js';
@@ -115,7 +114,6 @@ class SCMHistoryItemRefsActionViewItem extends ActionViewItem {
  name.textContent = localize('auto', "Auto");
  } else if (this._historyItemsFilter.length === 1) {
  name.textContent = this._historyItemsFilter[0].name;
- reset(this.label, ...renderLabelWithIcons(`$(git-branch) ${this._historyItemsFilter[0].name}`));
  } else {
  name.textContent = localize('items', "{0} Items", this._historyItemsFilter.length);
  }