mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2024-12-28 23:55:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

git_backend: use lossy conversion to decode non-UTF-8 commit message

Browse source 
If message() returned None, it doesn't mean the commit message is empty. I
originally mapped it to an error, but that made import of linux repo fail.

https://docs.rs/git2/latest/git2/struct.Commit.html#method.message
This commit is contained in:
Yuya Nishihara 2023-10-30 06:33:14 +09:00
parent 06c254e742
commit 847adc832f
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/src/git_backend.rs
View file

@ -316,7 +316,9 @@ fn commit_from_git_without_root_parent(
} else { } else {
MergedTreeId::Legacy(tree_id) MergedTreeId::Legacy(tree_id)
}; };
let description = commit.message().unwrap_or("<no message>").to_owned(); // Use lossy conversion as commit message with "mojibake" is still better than
// nothing.
let description = String::from_utf8_lossy(commit.message_bytes()).into_owned();
let author = signature_from_git(commit.author()); let author = signature_from_git(commit.author());
let committer = signature_from_git(commit.committer()); let committer = signature_from_git(commit.committer());