Skip to content
This repository has been archived by the owner on Nov 7, 2024. It is now read-only.

deploy: Always use merge commit #556

Merged
merged 1 commit into from
Oct 20, 2023
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/src/container/deploy.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand Down
Loading