UpstreamIndex: Extract create_empty_commit() method

Author: Turbo87

src/tests/git.rs

@@ -1,3 +1,4 @@
+use anyhow::anyhow;
 use git2::Repository;
 use std::env;
 use std::fs;
@@ -22,6 +23,23 @@ impl UpstreamIndex {
     pub fn url() -> Url {
         Url::from_file_path(&bare()).unwrap()
     }
+
+    pub fn create_empty_commit(&self) -> anyhow::Result<()> {
+        let repo = &self.repository;
+
+        let head = repo.head()?;
+        let target = head
+            .target()
+            .ok_or_else(|| anyhow!("Missing target for HEAD"))?;
+
+        let sig = repo.signature()?;
+        let parent = repo.find_commit(target)?;
+        let tree = repo.find_tree(parent.tree_id())?;
+
+        repo.commit(Some("HEAD"), &sig, &sig, "empty commit", &tree, &[&parent])?;
+
+        Ok(())
+    }
 }
 
 fn root() -> PathBuf {

src/tests/krate/publish.rs

@@ -563,14 +563,7 @@ fn new_krate_git_upload_appends() {
 fn new_krate_git_upload_with_conflicts() {
     let (app, _, _, token) = TestApp::full().with_token();
 
-    let index = app.upstream_repository();
-    let target = index.head().unwrap().target().unwrap();
-    let sig = index.signature().unwrap();
-    let parent = index.find_commit(target).unwrap();
-    let tree = index.find_tree(parent.tree_id()).unwrap();
-    index
-        .commit(Some("HEAD"), &sig, &sig, "empty commit", &tree, &[&parent])
-        .unwrap();
+    app.upstream_index().create_empty_commit().unwrap();
 
     let crate_to_publish = PublishBuilder::new("foo_conflicts");
     token.enqueue_publish(crate_to_publish).good();