Browse Source

Fixes #2359 duplicate avatar in interactive rebase

main
Keith Daulton 2 years ago
parent
commit
94cac8c012
2 changed files with 2 additions and 1 deletions
  1. +1
    -0
      CHANGELOG.md
  2. +1
    -1
      src/webviews/apps/rebase/rebase.ts

+ 1
- 0
CHANGELOG.md View File

@ -9,6 +9,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
### Fixed
- Fixes [#2354](https://github.com/gitkraken/vscode-gitlens/issues/2354) - 'GitLens: Compare working three with...' Not able to select branch using keyboard
- Fixes [#2359](https://github.com/gitkraken/vscode-gitlens/issues/2359) - rebase view shows 2 user icons even when they're the same
## [13.1.0] - 2022-11-17

+ 1
- 1
src/webviews/apps/rebase/rebase.ts View File

@ -511,7 +511,7 @@ class RebaseEditor extends App {
$avatarStack.classList.add('entry-avatar');
const hasAuthor = author?.avatarUrl.length;
const hasCommitter = author !== committer && committer?.avatarUrl.length;
const hasCommitter = author !== committer && author.author !== 'You' && committer?.avatarUrl.length;
if (hasAuthor) {
const $avatar = document.createElement('avatar-item') as AvatarItem;
$avatar.media = author.avatarUrl;

Loading…
Cancel
Save