From b5327a65c111b5ca867b08c55450f22602544635 Mon Sep 17 00:00:00 2001
From: Stephan Dilly <dilly.stephan@gmail.com>
Date: Wed, 12 May 2021 09:01:08 +0200
Subject: [PATCH] rename

---
 asyncgit/src/sync/merge.rs | 6 +++---
 asyncgit/src/sync/mod.rs   | 2 +-
 src/tabs/status.rs         | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/asyncgit/src/sync/merge.rs b/asyncgit/src/sync/merge.rs
index 323d451b..5c3caa55 100644
--- a/asyncgit/src/sync/merge.rs
+++ b/asyncgit/src/sync/merge.rs
@@ -6,8 +6,8 @@ use git2::{BranchType, MergeOptions};
 use scopetime::scope_time;
 
 ///
-pub fn merge_state_info(repo_path: &str) -> Result<Vec<CommitId>> {
-    scope_time!("merge_state_info");
+pub fn mergehead_ids(repo_path: &str) -> Result<Vec<CommitId>> {
+    scope_time!("mergehead_ids");
 
     let mut repo = utils::repo(repo_path)?;
 
@@ -86,7 +86,7 @@ mod tests {
 
         merge_branch(repo_path, "master").unwrap();
 
-        let mergeheads = merge_state_info(repo_path).unwrap();
+        let mergeheads = mergehead_ids(repo_path).unwrap();
 
         assert_eq!(mergeheads[0], c1);
     }
diff --git a/asyncgit/src/sync/mod.rs b/asyncgit/src/sync/mod.rs
index 94074d96..592dc1d1 100644
--- a/asyncgit/src/sync/mod.rs
+++ b/asyncgit/src/sync/mod.rs
@@ -50,7 +50,7 @@ pub use hooks::{
 pub use hunks::{reset_hunk, stage_hunk, unstage_hunk};
 pub use ignore::add_to_ignore;
 pub use logwalker::LogWalker;
-pub use merge::{abort_merge, merge_branch, merge_state_info};
+pub use merge::{abort_merge, merge_branch, mergehead_ids};
 pub use remotes::{
     get_default_remote, get_remotes, push::AsyncProgress,
     tags::PushTagsProgress,
diff --git a/src/tabs/status.rs b/src/tabs/status.rs
index 275dac4b..f265f582 100644
--- a/src/tabs/status.rs
+++ b/src/tabs/status.rs
@@ -218,7 +218,7 @@ impl Status {
         if let Ok(state) = sync::repo_state(CWD) {
             if state != RepoState::Clean {
                 let ids =
-                    sync::merge_state_info(CWD).unwrap_or_default();
+                    sync::mergehead_ids(CWD).unwrap_or_default();
                 let ids = format!(
                     "({})",
                     ids.iter()