easegit-cli 1.0.4 → 1.0.6

package/dist/git/plumbing.d.ts

@@ -36,7 +36,7 @@ export declare function getCheckpointInfo(refName: string): {
     commitSha: string;
 } | null;
 /**
- * Restore working directory from a tree SHA
+ * Restore working directory from a commit SHA (restores all files including untracked)
  */
 export declare function restoreFromTree(commitSha: string): void;
 /**

package/dist/git/plumbing.js

@@ -123,9 +123,8 @@ function createCheckpointRef(treeSha, operation) {
     const timestamp = Date.now();
     const refName = `refs/easegit/checkpoints/${timestamp}`;
     // Create a commit object for the checkpoint
-    const message = `EaseGit checkpoint before ${operation}\nTimestamp: ${timestamp}`;
-    // Use current HEAD as parent if it exists
-    const commitArgs = ['commit-tree', treeSha, '-m', message];
+    // Use multiple -m flags for multi-line messages (Windows compatible)
+    const commitArgs = ['commit-tree', treeSha, '-m', `EaseGit checkpoint before ${operation}`, '-m', `Timestamp: ${timestamp}`];
     try {
         const head = gitExec(['rev-parse', 'HEAD']);
         commitArgs.splice(2, 0, '-p', head);
@@ -143,7 +142,8 @@ function createCheckpointRef(treeSha, operation) {
  */
 function getLatestCheckpointRef() {
     try {
-        const refs = gitExec(['for-each-ref', 'refs/easegit/checkpoints/', '--sort=-refname', '--format=%(refname)', '--count=1']);
+        // Use -version:refname to sort refs numerically by the timestamp in the refname
+        const refs = gitExec(['for-each-ref', 'refs/easegit/checkpoints/', '--sort=-version:refname', '--format=%(refname)', '--count=1']);
         return refs || null;
     }
     catch {
@@ -172,14 +172,19 @@ function getCheckpointInfo(refName) {
     }
 }
 /**
- * Restore working directory from a tree SHA
+ * Restore working directory from a commit SHA (restores all files including untracked)
  */
 function restoreFromTree(commitSha) {
-    const repoRoot = getRepoRoot();
-    // Clear working directory (except .git)
+    // Get the tree from the commit
+    const treeSha = gitExec(['rev-parse', `${commitSha}^{tree}`]);
+    // Clear working directory first (except .git)
     gitExec(['clean', '-fd']);
-    // Checkout the tree without moving HEAD
-    gitExec(['checkout', commitSha, '--', '.']);
+    // Read the tree into index
+    gitExec(['read-tree', treeSha]);
+    // Checkout all files from index into working directory
+    gitExec(['checkout-index', '-f', '-a']);
+    // Reset the index to match the restored tree so git status shows clean
+    gitExec(['reset', '--mixed']);
 }
 /**
  * Check if there are merge conflicts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "easegit-cli",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "description": "Automatic checkpoints before Git can hurt you",
   "main": "dist/index.js",
   "bin": {