isomorphic-git 1.42.2 → 1.42.4

package/index.cjs

@@ -5755,14 +5755,17 @@ class GitIgnoreManager {
       });
     }
     let ignoredStatus = false;
-    for (const p of pairs) {
+    for (const [index, p] of pairs.entries()) {
       let file;
       try {
         file = await fs.read(p.gitignore, 'utf8');
       } catch (err) {
         if (err.code === 'NOENT') continue
       }
-      const ign = ignore().add(excludes);
+      const ign = ignore();
+      // The patterns in .git/info/exclude are relative to the working directory,
+      // so only the first pair, which holds the full filepath, can use them.
+      if (index === 0) ign.add(excludes);
       ign.add(file);
       // If the parent directory is excluded, we are done.
       // "It is not possible to re-include a file if a parent directory of that file is excluded. Git doesn’t list excluded directories for performance reasons, so any patterns on contained files have no effect, no matter where they are defined."
@@ -6256,12 +6259,15 @@ async function _commit({
       gitdir,
       ref,
     });
-    refCommit = await _readCommit({ fs, gitdir, oid: refOid, cache: {} });
   } catch {
     // We assume that there's no commit and this is the initial commit
     initialCommit = true;
   }
 
+  if (!initialCommit && (amend || disallowEmpty)) {
+    refCommit = await _readCommit({ fs, gitdir, oid: refOid, cache });
+  }
+
   if (amend && initialCommit) {
     throw new NoCommitError(ref)
   }
@@ -9800,8 +9806,8 @@ function filterCapabilities(server, client) {
 
 const pkg = {
   name: 'isomorphic-git',
-  version: '1.42.2',
-  agent: 'git/isomorphic-git@1.42.2',
+  version: '1.42.4',
+  agent: 'git/isomorphic-git@1.42.4',
 };
 
 class FIFO {

package/index.js

@@ -5742,14 +5742,17 @@ class GitIgnoreManager {
       });
     }
     let ignoredStatus = false;
-    for (const p of pairs) {
+    for (const [index, p] of pairs.entries()) {
       let file;
       try {
         file = await fs.read(p.gitignore, 'utf8');
       } catch (err) {
         if (err.code === 'NOENT') continue
       }
-      const ign = ignore().add(excludes);
+      const ign = ignore();
+      // The patterns in .git/info/exclude are relative to the working directory,
+      // so only the first pair, which holds the full filepath, can use them.
+      if (index === 0) ign.add(excludes);
       ign.add(file);
       // If the parent directory is excluded, we are done.
       // "It is not possible to re-include a file if a parent directory of that file is excluded. Git doesn’t list excluded directories for performance reasons, so any patterns on contained files have no effect, no matter where they are defined."
@@ -6243,12 +6246,15 @@ async function _commit({
       gitdir,
       ref,
     });
-    refCommit = await _readCommit({ fs, gitdir, oid: refOid, cache: {} });
   } catch {
     // We assume that there's no commit and this is the initial commit
     initialCommit = true;
   }
 
+  if (!initialCommit && (amend || disallowEmpty)) {
+    refCommit = await _readCommit({ fs, gitdir, oid: refOid, cache });
+  }
+
   if (amend && initialCommit) {
     throw new NoCommitError(ref)
   }
@@ -9787,8 +9793,8 @@ function filterCapabilities(server, client) {
 
 const pkg = {
   name: 'isomorphic-git',
-  version: '1.42.2',
-  agent: 'git/isomorphic-git@1.42.2',
+  version: '1.42.4',
+  agent: 'git/isomorphic-git@1.42.4',
 };
 
 class FIFO {