isomorphic-git 1.37.2 → 1.37.4

package/README.md

@@ -77,7 +77,10 @@ git.clone({ fs, http, dir, url: 'https://github.com/isomorphic-git/lightning-fs'
 ```
 
 If you're using `isomorphic-git` in the browser, you'll need something that emulates the `fs` API.
-The easiest to setup and most performant library is [LightningFS](https://github.com/isomorphic-git/lightning-fs) which is written and maintained by the same author and is part of the `isomorphic-git` suite.
+The easiest to setup and most performant library is [LightningFS](https://github.com/isomorphic-git/lightning-fs) which is written and maintained by the same author and is part of the `isomorphic-git` suite. 
+
+⚠️ LightningFS may apply file operations out of order, which can lead to repository corruption if the process crashes. You can mitigate this by calling `fs.flush()` after Git operations.
+
 If LightningFS doesn't meet your requirements, isomorphic-git should also work with [ZenFS](https://github.com/zen-fs/core) and [Filer](https://github.com/filerjs/filer).
 Instead of `isomorphic-git/http/node` this time import `isomorphic-git/http/web`:
 

package/index.cjs

@@ -3273,12 +3273,13 @@ class GitPackIndex {
       0b1100000: 'ofs_delta',
       0b1110000: 'ref_delta',
     };
-    if (!this.pack) {
+    const pack = await this.pack;
+    if (!pack) {
       throw new InternalError(
-        'Tried to read from a GitPackIndex with no packfile loaded into memory'
+        'Could not read packfile data. The packfile may be missing, corrupted, or too large to read into memory.'
       )
     }
-    const raw = (await this.pack).slice(start);
+    const raw = pack.slice(start);
     const reader = new BufferCursor(raw);
     const byte = reader.readUInt8();
     // Object type is encoded in bits 654
@@ -3390,12 +3391,18 @@ async function readObjectPacked({
     if (p.error) throw new InternalError(p.error)
     // If the packfile DOES have the oid we're looking for...
     if (p.offsets.has(oid)) {
-      // Get the resolved git object from the packfile
+      // Derive the .pack path from the .idx path
+      const packFile = indexFile.replace(/idx$/, 'pack');
       if (!p.pack) {
-        const packFile = indexFile.replace(/idx$/, 'pack');
         p.pack = fs.read(packFile);
       }
       const pack = await p.pack;
+      if (!pack) {
+        p.pack = null;
+        throw new InternalError(
+          `Could not read packfile at ${packFile}. The file may be missing, corrupted, or too large to read into memory.`
+        )
+      }
 
       // === Packfile Integrity Verification ===
       // Performance optimization: use _checksumVerified flag to verify only once per packfile
@@ -5201,7 +5208,7 @@ function assertParameter(name, value) {
 /**
  * discoverGitdir
  *
- * When processing git commands on a submodule determine
+ * When processing git commands on a submodule or worktree, determine
  * the actual git directory based on the contents of the .git file.
  *
  * Otherwise (if sent a directory) return that directory as-is.
@@ -5218,6 +5225,11 @@ function assertParameter(name, value) {
  *
  */
 
+// Check if a path is absolute (Unix / or Windows drive letter like C:\ or C:/)
+function isAbsolute(filepath) {
+  return filepath.startsWith('/') || /^[a-zA-Z]:[\\/]/.test(filepath)
+}
+
 async function discoverGitdir({ fsp, dotgit }) {
   assertParameter('fsp', fsp);
   assertParameter('dotgit', dotgit);
@@ -5232,6 +5244,10 @@ async function discoverGitdir({ fsp, dotgit }) {
       ._readFile(dotgit, 'utf8')
       .then(contents => contents.trimRight().substr(8))
       .then(submoduleGitdir => {
+        // Worktrees use absolute gitdir paths; submodules use relative ones.
+        if (isAbsolute(submoduleGitdir)) {
+          return submoduleGitdir
+        }
         const gitdir = join(dirname(dotgit), submoduleGitdir);
         return gitdir
       })
@@ -9295,8 +9311,8 @@ function filterCapabilities(server, client) {
 
 const pkg = {
   name: 'isomorphic-git',
-  version: '1.37.2',
-  agent: 'git/isomorphic-git@1.37.2',
+  version: '1.37.4',
+  agent: 'git/isomorphic-git@1.37.4',
 };
 
 class FIFO {

package/index.js

@@ -3267,12 +3267,13 @@ class GitPackIndex {
       0b1100000: 'ofs_delta',
       0b1110000: 'ref_delta',
     };
-    if (!this.pack) {
+    const pack = await this.pack;
+    if (!pack) {
       throw new InternalError(
-        'Tried to read from a GitPackIndex with no packfile loaded into memory'
+        'Could not read packfile data. The packfile may be missing, corrupted, or too large to read into memory.'
       )
     }
-    const raw = (await this.pack).slice(start);
+    const raw = pack.slice(start);
     const reader = new BufferCursor(raw);
     const byte = reader.readUInt8();
     // Object type is encoded in bits 654
@@ -3384,12 +3385,18 @@ async function readObjectPacked({
     if (p.error) throw new InternalError(p.error)
     // If the packfile DOES have the oid we're looking for...
     if (p.offsets.has(oid)) {
-      // Get the resolved git object from the packfile
+      // Derive the .pack path from the .idx path
+      const packFile = indexFile.replace(/idx$/, 'pack');
       if (!p.pack) {
-        const packFile = indexFile.replace(/idx$/, 'pack');
         p.pack = fs.read(packFile);
       }
       const pack = await p.pack;
+      if (!pack) {
+        p.pack = null;
+        throw new InternalError(
+          `Could not read packfile at ${packFile}. The file may be missing, corrupted, or too large to read into memory.`
+        )
+      }
 
       // === Packfile Integrity Verification ===
       // Performance optimization: use _checksumVerified flag to verify only once per packfile
@@ -5195,7 +5202,7 @@ function assertParameter(name, value) {
 /**
  * discoverGitdir
  *
- * When processing git commands on a submodule determine
+ * When processing git commands on a submodule or worktree, determine
  * the actual git directory based on the contents of the .git file.
  *
  * Otherwise (if sent a directory) return that directory as-is.
@@ -5212,6 +5219,11 @@ function assertParameter(name, value) {
  *
  */
 
+// Check if a path is absolute (Unix / or Windows drive letter like C:\ or C:/)
+function isAbsolute(filepath) {
+  return filepath.startsWith('/') || /^[a-zA-Z]:[\\/]/.test(filepath)
+}
+
 async function discoverGitdir({ fsp, dotgit }) {
   assertParameter('fsp', fsp);
   assertParameter('dotgit', dotgit);
@@ -5226,6 +5238,10 @@ async function discoverGitdir({ fsp, dotgit }) {
       ._readFile(dotgit, 'utf8')
       .then(contents => contents.trimRight().substr(8))
       .then(submoduleGitdir => {
+        // Worktrees use absolute gitdir paths; submodules use relative ones.
+        if (isAbsolute(submoduleGitdir)) {
+          return submoduleGitdir
+        }
         const gitdir = join(dirname(dotgit), submoduleGitdir);
         return gitdir
       })
@@ -9289,8 +9305,8 @@ function filterCapabilities(server, client) {
 
 const pkg = {
   name: 'isomorphic-git',
-  version: '1.37.2',
-  agent: 'git/isomorphic-git@1.37.2',
+  version: '1.37.4',
+  agent: 'git/isomorphic-git@1.37.4',
 };
 
 class FIFO {