From 94cac8c012abd673519b4c8a9b2c3e0534037b9b Mon Sep 17 00:00:00 2001 From: Keith Daulton Date: Mon, 21 Nov 2022 11:42:44 -0500 Subject: [PATCH] Fixes #2359 duplicate avatar in interactive rebase --- CHANGELOG.md | 1 + src/webviews/apps/rebase/rebase.ts | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d39dcb2..a3c43f4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 diff --git a/src/webviews/apps/rebase/rebase.ts b/src/webviews/apps/rebase/rebase.ts index 4790483..9d4f8a6 100644 --- a/src/webviews/apps/rebase/rebase.ts +++ b/src/webviews/apps/rebase/rebase.ts @@ -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;