javascript-solid-server 0.0.43 → 0.0.45

package/.claude/settings.local.json

@@ -137,7 +137,9 @@
       "Bash(git checkout:*)",
       "Bash(gh gist edit:*)",
       "Bash(gh gist view:*)",
-      "Bash(./bin/git-credential-nostr acl:*)"
+      "Bash(./bin/git-credential-nostr acl:*)",
+      "Bash(DATA_ROOT=/tmp/jss-git-test/data node:*)",
+      "Bash(git remote set-url:*)"
     ]
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "javascript-solid-server",
-  "version": "0.0.43",
+  "version": "0.0.45",
   "description": "A minimal, fast Solid server",
   "main": "src/index.js",
   "type": "module",

package/src/handlers/git.js

@@ -1,6 +1,6 @@
 import { spawn } from 'child_process';
 import { existsSync, statSync } from 'fs';
-import { join } from 'path';
+import { join, resolve } from 'path';
 
 /**
  * Check if a URL path is a Git protocol request
@@ -85,7 +85,7 @@ export async function handleGit(request, reply) {
     dataRoot = join(dataRoot, request.podName);
   }
 
-  const repoAbs = join(dataRoot, repoRelative);
+  const repoAbs = resolve(dataRoot, repoRelative);
 
   // Find git directory
   const gitInfo = findGitDir(repoAbs);
@@ -93,6 +93,14 @@ export async function handleGit(request, reply) {
     return reply.code(404).send({ error: 'Not a git repository' });
   }
 
+  // Auto-configure non-bare repos to accept pushes and update working directory
+  if (gitInfo.isRegular && isGitWriteOperation(urlPath)) {
+    spawn('git', ['config', 'receive.denyCurrentBranch', 'updateInstead'], {
+      cwd: repoAbs,
+      env: { ...process.env, GIT_DIR: gitInfo.gitDir }
+    });
+  }
+
   // Build CGI environment
   const env = {
     ...process.env,
@@ -202,26 +210,6 @@ export async function handleGit(request, reply) {
         reply.code(500).send({ error: 'Git operation failed' });
       }
 
-      // Auto-checkout working directory after successful push to non-bare repo
-      if (code === 0 && isGitWriteOperation(urlPath) && gitInfo.isRegular) {
-        const checkout = spawn('git', ['checkout', '-f'], {
-          cwd: repoAbs,
-          env: {
-            ...process.env,
-            GIT_DIR: gitInfo.gitDir,
-            GIT_WORK_TREE: repoAbs
-          }
-        });
-        checkout.on('error', (err) => {
-          console.error('Auto-checkout failed:', err.message);
-        });
-        checkout.on('close', (checkoutCode) => {
-          if (checkoutCode !== 0) {
-            console.error('Auto-checkout exited with code:', checkoutCode);
-          }
-        });
-      }
-
       resolve();
     });
   });