easegit-cli 1.0.5 → 1.0.7

package/dist/git/plumbing.js

@@ -51,16 +51,19 @@ const path = __importStar(require("path"));
  * Execute a Git command and return output
  */
 function gitExec(args, cwd) {
-    try {
-        return (0, child_process_1.execSync)(`git ${args.join(' ')}`, {
-            cwd: cwd || process.cwd(),
-            encoding: 'utf8',
-            stdio: ['pipe', 'pipe', 'pipe']
-        }).trim();
-    }
-    catch (error) {
-        throw new Error(`Git command failed: ${error.message}`);
-    }
+    const result = (0, child_process_1.spawnSync)('git', args, {
+        cwd: cwd || process.cwd(),
+        encoding: 'utf8',
+        stdio: ['pipe', 'pipe', 'pipe']
+    });
+    if (result.error) {
+        throw new Error(`Git command failed: ${result.error.message}`);
+    }
+    if (result.status !== 0) {
+        const stderr = result.stderr ? result.stderr.toString().trim() : '';
+        throw new Error(`Git command failed: ${stderr || 'Unknown error'}`);
+    }
+    return (result.stdout || '').toString().trim();
 }
 /**
  * Check if current directory is a Git repository
@@ -123,9 +126,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);
@@ -178,12 +180,14 @@ function getCheckpointInfo(refName) {
 function restoreFromTree(commitSha) {
     // Get the tree from the commit
     const treeSha = gitExec(['rev-parse', `${commitSha}^{tree}`]);
+    // Clear working directory first (except .git)
+    gitExec(['clean', '-fd']);
     // Read the tree into index
     gitExec(['read-tree', treeSha]);
     // Checkout all files from index into working directory
     gitExec(['checkout-index', '-f', '-a']);
-    // Clean up any files that existed in the old checkpoint but not the new one
-    gitExec(['clean', '-fd']);
+    // 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.5",
+  "version": "1.0.7",
   "description": "Automatic checkpoints before Git can hurt you",
   "main": "dist/index.js",
   "bin": {