easegit-cli 1.1.0 → 1.2.0

package/dist/init.js

@@ -52,9 +52,12 @@ async function init() {
     const packageRoot = path.join(__dirname, '..');
     const config = { packageRoot };
     fs.writeFileSync(configPath, JSON.stringify(config, null, 2));
-    // Hook definitions
+    // Hook definitions - only hooks that protect against losing work
+    // pre-rebase: rebase can destroy uncommitted work
+    // pre-merge-commit: merge can create conflicts and lose work
+    // pre-push: checkpoint before pushing (safety net)
+    // post-checkout: checkout can discard uncommitted changes
     const hooks = [
-        'pre-commit',
         'pre-rebase',
         'pre-merge-commit',
         'pre-push',

package/hooks/pre-push

@@ -1,45 +1,15 @@
 #!/usr/bin/env node
 
 // Pre-push hook - creates checkpoint before push
-const fs = require("fs");
-const path = require("path");
+const path = require('path');
+const fs = require('fs');
 
-try {
-  // Find .git directory by walking up from cwd
-  let gitDir = ".git";
-  if (!fs.existsSync(gitDir)) {
-    let current = process.cwd();
-    while (current !== path.dirname(current)) {
-      const candidate = path.join(current, ".git");
-      if (fs.existsSync(candidate)) {
-        gitDir = candidate;
-        break;
-      }
-      current = path.dirname(current);
-    }
-  }
+// Find package root from .git/easegit.json
+const gitDir = process.env.GIT_DIR || '.git';
+const configPath = path.join(gitDir, 'easegit.json');
 
-  // Read config written by easegit init
-  const configPath = path.join(gitDir, "easegit.json");
-  const config = JSON.parse(fs.readFileSync(configPath, "utf8"));
-  const packageRoot = config.packageRoot;
-
-  if (!packageRoot || !fs.existsSync(packageRoot)) {
-    throw new Error(`Invalid easegit config: packageRoot=${packageRoot}`);
-  }
-
-  // Now require the module using the known package root
-  const { createCheckpoint } = require(path.join(
-    packageRoot,
-    "dist",
-    "snapshot",
-    "create"
-  ));
-  createCheckpoint("push");
-} catch (err) {
-  console.error(
-    "EaseGit pre-push hook failed. Run `easegit init` to reinstall hooks."
-  );
-  console.error(`Error: ${err.message}`);
-  process.exit(1);
+if (fs.existsSync(configPath)) {
+  const config = JSON.parse(fs.readFileSync(configPath, 'utf8'));
+  const { createCheckpoint } = require(path.join(config.packageRoot, 'dist', 'snapshot', 'create'));
+  createCheckpoint('push');
 }

package/package.json

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

package/hooks/pre-commit

@@ -1,45 +0,0 @@
-#!/usr/bin/env node
-
-// Pre-commit hook - creates checkpoint before commit
-const fs = require("fs");
-const path = require("path");
-
-try {
-  // Find .git directory by walking up from cwd
-  let gitDir = ".git";
-  if (!fs.existsSync(gitDir)) {
-    let current = process.cwd();
-    while (current !== path.dirname(current)) {
-      const candidate = path.join(current, ".git");
-      if (fs.existsSync(candidate)) {
-        gitDir = candidate;
-        break;
-      }
-      current = path.dirname(current);
-    }
-  }
-
-  // Read config written by easegit init
-  const configPath = path.join(gitDir, "easegit.json");
-  const config = JSON.parse(fs.readFileSync(configPath, "utf8"));
-  const packageRoot = config.packageRoot;
-
-  if (!packageRoot || !fs.existsSync(packageRoot)) {
-    throw new Error(`Invalid easegit config: packageRoot=${packageRoot}`);
-  }
-
-  // Now require the module using the known package root
-  const { createCheckpoint } = require(path.join(
-    packageRoot,
-    "dist",
-    "snapshot",
-    "create"
-  ));
-  createCheckpoint("commit");
-} catch (err) {
-  console.error(
-    "EaseGit pre-commit hook failed. Run `easegit init` to reinstall hooks."
-  );
-  console.error(`Error: ${err.message}`);
-  process.exit(1);
-}