Try it with remote_ref

bodymindarts · Jul 21, 2021 · 1d0d7a6 · 1d0d7a6
1 parent e8217b8
commit 1d0d7a6
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 21 deletions.
diff --git a/ci/release_notes.md b/ci/release_notes.md
@@ -1 +1,3 @@
-Empty - please add release notes here
+## Bug Fix
+
+- attempt to fix push to branch
diff --git a/src/repo.rs b/src/repo.rs
@@ -114,31 +114,35 @@ impl Repo {
         let head_commit = self
             .inner
             .reference_to_annotated_commit(&self.inner.head()?)?;
-        if let Ok(remote_ref) = self
+        let remote_ref = self
             .inner
-            .resolve_reference_from_short_name(&format!("origin/{}", branch))
-        {
-            let remote_commit = self.inner.reference_to_annotated_commit(&remote_ref)?;
-            let mut rebase_options = RebaseOptions::new();
-            let mut merge_options = MergeOptions::new();
-            merge_options.fail_on_conflict(true);
-            rebase_options.merge_options(merge_options);
-            let mut rebase = self.inner.rebase(
-                Some(&head_commit),
-                Some(&remote_commit),
-                None,
-                Some(&mut rebase_options),
-            )?;
-            let sig = Signature::now("Cepler", "bot@cepler.dev")?;
-            while let Some(_) = rebase.next() {
-                rebase.commit(None, &sig, None)?;
-            }
-            rebase.finish(None)?;
+            .resolve_reference_from_short_name(&format!("origin/{}", branch))?;
+        let remote_commit = self.inner.reference_to_annotated_commit(&remote_ref)?;
+
+        let mut rebase_options = RebaseOptions::new();
+        let mut merge_options = MergeOptions::new();
+        merge_options.fail_on_conflict(true);
+        rebase_options.merge_options(merge_options);
+        let mut rebase = self.inner.rebase(
+            Some(&head_commit),
+            Some(&remote_commit),
+            None,
+            Some(&mut rebase_options),
+        )?;
+        let sig = Signature::now("Cepler", "bot@cepler.dev")?;
+        while let Some(_) = rebase.next() {
+            rebase.commit(None, &sig, None)?;
         }
+        rebase.finish(None)?;
+
         let mut push_options = PushOptions::new();
         push_options.remote_callbacks(remote_callbacks(private_key));
         remote.push(
-            &[format!("{}:{}", head_commit.refname().unwrap(), branch)],
+            &[format!(
+                "{}:{}",
+                head_commit.refname().unwrap(),
+                remote_ref.name().unwrap()
+            )],
             Some(&mut push_options),
         )?;
         Ok(())