1 files changed, 29 insertions, 12 deletions

diff --git a/mingling_ci/src/cmd/cmd_git_lock.rs b/mingling_ci/src/cmd/cmd_git_lock.rs
index 4398593..0e9bf22 100644
--- a/mingling_ci/src/cmd/cmd_git_lock.rs
+++ b/mingling_ci/src/cmd/cmd_git_lock.rs
@@ -5,46 +5,63 @@ use mingling::{
 };
 
 use crate::Next;
-use crate::git::{LOCK_FILE, TEMP_COMMIT_MESSAGE, run_git, worktree_clean};
+use crate::git::{CI_TEMP_COMMIT_MESSAGE, LOCK_FILE, TEMP_COMMIT_MESSAGE, run_git, worktree_clean};
 use crate::res::{CargoError, MessagePrinter};
 
 /// Temporarily commits the workspace so CI can run on a stable tree.
 ///
 /// First pins the current HEAD to the `mingling/bkup` backup branch (created
-/// or force-reset), then commits everything with a `[DO NOT PUSH] CI TEMP`
-/// message. When the tree has no tracked changes, a `MINGLING-CI-CHECKING`
-/// marker file is created first so the commit is never empty.
+/// or force-reset). When the tree is dirty, all changes are packed into a
+/// plain `TEMP` commit first so they can be restored later; the `CI TEMP`
+/// commit then carries only the `MINGLING-CI-CHECKING` marker file, whose
+/// content (`true`/`false`) tells `git-unlock` which restore path to take.
 #[command(node = "git-lock")]
 pub fn git_lock() -> Next {
     if let Err(e) = run_git(["branch", "-f", "mingling/bkup", "HEAD"]) {
         return ErrorGitLock(e).to_chain();
     }
 
-    if worktree_clean()
-        && let Err(e) = std::fs::write(LOCK_FILE, "")
-    {
+    let dirty = !worktree_clean();
+    if dirty {
+        if let Err(e) = run_git(["add", "."]) {
+            return ErrorGitLock(e).to_chain();
+        }
+        if let Err(e) = run_git(["commit", "-m", TEMP_COMMIT_MESSAGE]) {
+            return ErrorGitLock(e).to_chain();
+        }
+    }
+
+    let marker = if dirty { "true" } else { "false" };
+    if let Err(e) = std::fs::write(LOCK_FILE, marker) {
         return ErrorGitLock(format!("failed to create {LOCK_FILE}: {e}")).to_chain();
     }
 
     if let Err(e) = run_git(["add", "."]) {
         return ErrorGitLock(e).to_chain();
     }
-    if let Err(e) = run_git(["commit", "-m", TEMP_COMMIT_MESSAGE]) {
+    if let Err(e) = run_git(["commit", "-m", CI_TEMP_COMMIT_MESSAGE]) {
         return ErrorGitLock(e).to_chain();
     }
 
-    ResultGitLock {}.to_chain()
+    ResultGitLock { dirty }.to_chain()
 }
 
+/// Whether the tree was dirty (a base `TEMP` commit exists) when locking.
 #[derive(Grouped)]
-pub struct ResultGitLock;
+pub struct ResultGitLock {
+    dirty: bool,
+}
 
 #[derive(Grouped, Default)]
 pub struct ErrorGitLock(pub String);
 
 #[renderer(buffer)]
-pub fn render_git_lock(_: ResultGitLock) {
-    r_println!("Locked: CI temp commit created");
+pub fn render_git_lock(r: ResultGitLock) {
+    if r.dirty {
+        r_println!("Locked: dirty workspace committed for CI");
+    } else {
+        r_println!("Locked: clean workspace marked for CI");
+    }
 }
 
 #[renderer]