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

rename

Browse source
This commit is contained in:
Stephan Dilly 2021-05-12 09:01:08 +02:00
parent f30ec49886
commit b5327a65c1
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -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);
}

2
asyncgit/src/sync/mod.rs
View file

@ -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,

2
src/tabs/status.rs
View file

@ -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()