Merge pull request #556 from cgwalters/deploy-squashed

deploy: Always use merge commit
ostreedev · Oct 20, 2023 · 693c5eb · 693c5eb
2 parents d70a9c9 + 0d8c7ea
commit 693c5eb
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/lib/src/container/deploy.rs b/lib/src/container/deploy.rs
@@ -81,7 +81,7 @@ pub async fn deploy(
             imp.import(prep).await?
         }
     };
-    let commit = state.get_commit();
+    let commit = state.merge_commit.as_str();
     let origin = glib::KeyFile::new();
     let target_imgref = options.target_imgref.unwrap_or(imgref);
     origin.set_string("origin", ORIGIN_CONTAINER, &target_imgref.to_string());