isomorphic-git 1.40.1 → 1.40.3

package/index.cjs

@@ -5765,6 +5765,18 @@ async function add({
   }
 }
 
+// True for a path the index already holds, and for a folder holding one. The
+// exact lookup is a Map hit; the prefix scan only runs for folders, since a
+// tracked file always answers on the first check.
+function isTracked(index, filepath) {
+  if (index.has({ filepath })) return true
+  const prefix = `${filepath}/`;
+  for (const entry of index.entriesMap.keys()) {
+    if (entry.startsWith(prefix)) return true
+  }
+  return false
+}
+
 async function addToIndex({
   dir,
   gitdir,
@@ -5775,10 +5787,13 @@ async function addToIndex({
   parallel,
   autocrlf,
 }) {
-  // TODO: Should ignore UNLESS it's already in the index.
   filepath = Array.isArray(filepath) ? filepath : [filepath];
   const promises = filepath.map(async currentFilepath => {
-    if (!force) {
+    // .gitignore governs untracked paths. Once a path is in the index, adding a
+    // matching rule does not stop canonical git from staging further changes,
+    // and an ignored folder is still walked for the sake of what it tracks:
+    // the recursion below re-checks every child, so only tracked ones get in.
+    if (!force && !isTracked(index, currentFilepath)) {
       const ignored = await GitIgnoreManager.isIgnored({
         fs,
         dir,
@@ -9557,8 +9572,8 @@ function filterCapabilities(server, client) {
 
 const pkg = {
   name: 'isomorphic-git',
-  version: '1.40.1',
-  agent: 'git/isomorphic-git@1.40.1',
+  version: '1.40.3',
+  agent: 'git/isomorphic-git@1.40.3',
 };
 
 class FIFO {
@@ -16341,15 +16356,6 @@ async function status({
 
     const fs = new FileSystem(_fs);
     const updatedGitdir = await discoverGitdir({ fsp: fs, dotgit: gitdir });
-    const ignored = await GitIgnoreManager.isIgnored({
-      fs,
-      gitdir: updatedGitdir,
-      dir,
-      filepath,
-    });
-    if (ignored) {
-      return 'ignored'
-    }
     const headTree = await getHeadTree({ fs, cache, gitdir: updatedGitdir });
     const treeOid = await getOidAtPath({
       fs,
@@ -16367,6 +16373,20 @@ async function status({
         return null
       }
     );
+    // .gitignore governs untracked files. A file in HEAD or in the index is
+    // tracked, so canonical git keeps reporting its real state, and
+    // `git check-ignore` does not match it. statusMatrix already does this.
+    if (treeOid === null && indexEntry === null) {
+      const ignored = await GitIgnoreManager.isIgnored({
+        fs,
+        gitdir: updatedGitdir,
+        dir,
+        filepath,
+      });
+      if (ignored) {
+        return 'ignored'
+      }
+    }
     const stats = await fs.lstat(join(dir, filepath));
 
     const H = treeOid !== null; // head
@@ -16377,7 +16397,12 @@ async function status({
       if (I && !compareStats(indexEntry, stats)) {
         return indexEntry.oid
       } else {
-        const object = await fs.read(join(dir, filepath));
+        // Read through the same core.autocrlf normalisation GitWalkerFs uses,
+        // so the working copy hashes to the blob that was stored. Without it a
+        // CRLF checkout of an LF blob reads as modified.
+        const config = await GitConfigManager.get({ fs, gitdir: updatedGitdir });
+        const autocrlf = await config.get('core.autocrlf');
+        const object = await fs.read(join(dir, filepath), { autocrlf });
         const workdirOid = await hashObject$1({
           gitdir: updatedGitdir,
           type: 'blob',

package/index.js

@@ -5752,6 +5752,18 @@ async function add({
   }
 }
 
+// True for a path the index already holds, and for a folder holding one. The
+// exact lookup is a Map hit; the prefix scan only runs for folders, since a
+// tracked file always answers on the first check.
+function isTracked(index, filepath) {
+  if (index.has({ filepath })) return true
+  const prefix = `${filepath}/`;
+  for (const entry of index.entriesMap.keys()) {
+    if (entry.startsWith(prefix)) return true
+  }
+  return false
+}
+
 async function addToIndex({
   dir,
   gitdir,
@@ -5762,10 +5774,13 @@ async function addToIndex({
   parallel,
   autocrlf,
 }) {
-  // TODO: Should ignore UNLESS it's already in the index.
   filepath = Array.isArray(filepath) ? filepath : [filepath];
   const promises = filepath.map(async currentFilepath => {
-    if (!force) {
+    // .gitignore governs untracked paths. Once a path is in the index, adding a
+    // matching rule does not stop canonical git from staging further changes,
+    // and an ignored folder is still walked for the sake of what it tracks:
+    // the recursion below re-checks every child, so only tracked ones get in.
+    if (!force && !isTracked(index, currentFilepath)) {
       const ignored = await GitIgnoreManager.isIgnored({
         fs,
         dir,
@@ -9544,8 +9559,8 @@ function filterCapabilities(server, client) {
 
 const pkg = {
   name: 'isomorphic-git',
-  version: '1.40.1',
-  agent: 'git/isomorphic-git@1.40.1',
+  version: '1.40.3',
+  agent: 'git/isomorphic-git@1.40.3',
 };
 
 class FIFO {
@@ -16328,15 +16343,6 @@ async function status({
 
     const fs = new FileSystem(_fs);
     const updatedGitdir = await discoverGitdir({ fsp: fs, dotgit: gitdir });
-    const ignored = await GitIgnoreManager.isIgnored({
-      fs,
-      gitdir: updatedGitdir,
-      dir,
-      filepath,
-    });
-    if (ignored) {
-      return 'ignored'
-    }
     const headTree = await getHeadTree({ fs, cache, gitdir: updatedGitdir });
     const treeOid = await getOidAtPath({
       fs,
@@ -16354,6 +16360,20 @@ async function status({
         return null
       }
     );
+    // .gitignore governs untracked files. A file in HEAD or in the index is
+    // tracked, so canonical git keeps reporting its real state, and
+    // `git check-ignore` does not match it. statusMatrix already does this.
+    if (treeOid === null && indexEntry === null) {
+      const ignored = await GitIgnoreManager.isIgnored({
+        fs,
+        gitdir: updatedGitdir,
+        dir,
+        filepath,
+      });
+      if (ignored) {
+        return 'ignored'
+      }
+    }
     const stats = await fs.lstat(join(dir, filepath));
 
     const H = treeOid !== null; // head
@@ -16364,7 +16384,12 @@ async function status({
       if (I && !compareStats(indexEntry, stats)) {
         return indexEntry.oid
       } else {
-        const object = await fs.read(join(dir, filepath));
+        // Read through the same core.autocrlf normalisation GitWalkerFs uses,
+        // so the working copy hashes to the blob that was stored. Without it a
+        // CRLF checkout of an LF blob reads as modified.
+        const config = await GitConfigManager.get({ fs, gitdir: updatedGitdir });
+        const autocrlf = await config.get('core.autocrlf');
+        const object = await fs.read(join(dir, filepath), { autocrlf });
         const workdirOid = await hashObject$1({
           gitdir: updatedGitdir,
           type: 'blob',