Elgato_dark/gitui
1
0
Fork 0
mirror of https://github.com/gitui-org/gitui synced 2026-05-24 09:28:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use libgit2 to get the merge commit message. (#755)

Browse source
This commit is contained in:
Kieran Siek 2021-06-01 23:29:24 +08:00 committed by GitHub
parent 53f65c8377
commit a11c0b5eb6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
asyncgit/src/sync/merge.rs
View file

@ -1,5 +1,3 @@
use std::fs::read_to_string;
use crate::{ use crate::{
error::{Error, Result}, error::{Error, Result},
sync::{ sync::{
@ -82,10 +80,7 @@ pub fn merge_msg(repo_path: &str) -> Result<String> {
scope_time!("merge_msg"); scope_time!("merge_msg");
let repo = utils::repo(repo_path)?; let repo = utils::repo(repo_path)?;
let content = repo.message()?;
let msg_file = repo.path().join("MERGE_MSG");
let content = read_to_string(msg_file).unwrap_or_default();
Ok(content) Ok(content)
} }