Skip to content

Commit 94cac8c

Browse files
committed
Fixes #2359 duplicate avatar in interactive rebase
1 parent f8e8fa9 commit 94cac8c

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
99
### Fixed
1010

1111
- Fixes [#2354](https://github.com/gitkraken/vscode-gitlens/issues/2354) - 'GitLens: Compare working three with...' Not able to select branch using keyboard
12+
- Fixes [#2359](https://github.com/gitkraken/vscode-gitlens/issues/2359) - rebase view shows 2 user icons even when they're the same
1213

1314
## [13.1.0] - 2022-11-17
1415

src/webviews/apps/rebase/rebase.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -511,7 +511,7 @@ class RebaseEditor extends App<State> {
511511
$avatarStack.classList.add('entry-avatar');
512512

513513
const hasAuthor = author?.avatarUrl.length;
514-
const hasCommitter = author !== committer && committer?.avatarUrl.length;
514+
const hasCommitter = author !== committer && author.author !== 'You' && committer?.avatarUrl.length;
515515
if (hasAuthor) {
516516
const $avatar = document.createElement('avatar-item') as AvatarItem;
517517
$avatar.media = author.avatarUrl;

0 commit comments

Comments
 (0)