Show commit author, not committer (#27856)

Release Notes:

- Fixed a bug where the git panel displayed a commit's committer in
place of its author.
This commit is contained in:
Max Brunsfeld 2025-04-01 09:55:56 -07:00 committed by GitHub
parent 76871056f5
commit ada8b0f822
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 13 additions and 13 deletions

View file

@ -133,8 +133,8 @@ pub struct CommitDetails {
pub sha: SharedString, pub sha: SharedString,
pub message: SharedString, pub message: SharedString,
pub commit_timestamp: i64, pub commit_timestamp: i64,
pub committer_email: SharedString, pub author_email: SharedString,
pub committer_name: SharedString, pub author_name: SharedString,
} }
#[derive(Debug)] #[derive(Debug)]
@ -410,10 +410,10 @@ impl GitRepository for RealGitRepository {
.to_string() .to_string()
.into(), .into(),
commit_timestamp: commit.time().seconds(), commit_timestamp: commit.time().seconds(),
committer_email: String::from_utf8_lossy(commit.committer().email_bytes()) author_email: String::from_utf8_lossy(commit.author().email_bytes())
.to_string() .to_string()
.into(), .into(),
committer_name: String::from_utf8_lossy(commit.committer().name_bytes()) author_name: String::from_utf8_lossy(commit.author().name_bytes())
.to_string() .to_string()
.into(), .into(),
}; };

View file

@ -375,7 +375,7 @@ fn format_commit(commit: &CommitDetails) -> String {
writeln!( writeln!(
&mut result, &mut result,
"Author: {} <{}>", "Author: {} <{}>",
commit.committer_name, commit.committer_email commit.author_name, commit.author_email
) )
.unwrap(); .unwrap();
writeln!( writeln!(

View file

@ -3972,8 +3972,8 @@ impl GitPanelMessageTooltip {
let commit_details = crate::commit_tooltip::CommitDetails { let commit_details = crate::commit_tooltip::CommitDetails {
sha: details.sha.clone(), sha: details.sha.clone(),
author_name: details.committer_name.clone(), author_name: details.author_name.clone(),
author_email: details.committer_email.clone(), author_email: details.author_email.clone(),
commit_time: OffsetDateTime::from_unix_timestamp(details.commit_timestamp)?, commit_time: OffsetDateTime::from_unix_timestamp(details.commit_timestamp)?,
message: Some(ParsedCommitMessage { message: Some(ParsedCommitMessage {
message: details.message.clone(), message: details.message.clone(),

View file

@ -1881,8 +1881,8 @@ impl GitStore {
sha: commit.sha.into(), sha: commit.sha.into(),
message: commit.message.into(), message: commit.message.into(),
commit_timestamp: commit.commit_timestamp, commit_timestamp: commit.commit_timestamp,
committer_email: commit.committer_email.into(), author_email: commit.author_email.into(),
committer_name: commit.committer_name.into(), author_name: commit.author_name.into(),
}) })
} }
@ -2888,8 +2888,8 @@ impl Repository {
sha: resp.sha.into(), sha: resp.sha.into(),
message: resp.message.into(), message: resp.message.into(),
commit_timestamp: resp.commit_timestamp, commit_timestamp: resp.commit_timestamp,
committer_email: resp.committer_email.into(), author_email: resp.author_email.into(),
committer_name: resp.committer_name.into(), author_name: resp.author_name.into(),
}) })
} }
} }

View file

@ -3364,8 +3364,8 @@ message GitCommitDetails {
string sha = 1; string sha = 1;
string message = 2; string message = 2;
int64 commit_timestamp = 3; int64 commit_timestamp = 3;
string committer_email = 4; string author_email = 4;
string committer_name = 5; string author_name = 5;
} }
message LoadCommitDiff { message LoadCommitDiff {