From b9f9d9bfd2cca62d7dea91803c5911cba16e78c8 Mon Sep 17 00:00:00 2001 From: kosayoda Date: Tue, 1 Jun 2021 21:24:58 +0800 Subject: [PATCH] Use libgit2 to get the merge commit message. --- asyncgit/src/sync/merge.rs | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/asyncgit/src/sync/merge.rs b/asyncgit/src/sync/merge.rs index bb6e5d2f59..7572106aa4 100644 --- a/asyncgit/src/sync/merge.rs +++ b/asyncgit/src/sync/merge.rs @@ -1,5 +1,3 @@ -use std::fs::read_to_string; - use crate::{ error::{Error, Result}, sync::{ @@ -82,10 +80,7 @@ pub fn merge_msg(repo_path: &str) -> Result { scope_time!("merge_msg"); let repo = utils::repo(repo_path)?; - - let msg_file = repo.path().join("MERGE_MSG"); - - let content = read_to_string(msg_file).unwrap_or_default(); + let content = repo.message()?; Ok(content) }