From a073e0ac0225770b92ea638f415893cd40945c5e Mon Sep 17 00:00:00 2001 From: Stephan Dilly Date: Wed, 12 May 2021 09:13:28 +0200 Subject: [PATCH] preserve ref name in annotated commit --- asyncgit/src/sync/merge.rs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/asyncgit/src/sync/merge.rs b/asyncgit/src/sync/merge.rs index 5c3caa55..20646636 100644 --- a/asyncgit/src/sync/merge.rs +++ b/asyncgit/src/sync/merge.rs @@ -45,9 +45,8 @@ pub fn merge_branch(repo_path: &str, branch: &str) -> Result<()> { let branch = repo.find_branch(branch, BranchType::Local)?; - let id = branch.into_reference().peel_to_commit()?; - - let annotated = repo.find_annotated_commit(id.id())?; + let annotated = + repo.reference_to_annotated_commit(&branch.into_reference())?; let (analysis, _) = repo.merge_analysis(&[&annotated])?;