isomorphic-git 1.25.7 → 1.25.8

package/README.md

@@ -369,6 +369,7 @@ Thanks goes to these wonderful people ([emoji key](https://github.com/kentcdodds
     <td align="center"><a href="https://github.com/scolladon"><img src="https://avatars.githubusercontent.com/u/522422?v=4?s=60" width="60px;" alt=""/><br /><sub><b>Sebastien</b></sub></a><br /><a href="https://github.com/isomorphic-git/isomorphic-git/commits?author=scolladon" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/yarikoptic"><img src="https://avatars.githubusercontent.com/u/39889?v=4?s=60" width="60px;" alt=""/><br /><sub><b>Yaroslav Halchenko</b></sub></a><br /><a href="https://github.com/isomorphic-git/isomorphic-git/commits?author=yarikoptic" title="Documentation">📖</a></td>
     <td align="center"><a href="https://alex-v.blog/"><img src="https://avatars.githubusercontent.com/u/716334?v=4?s=60" width="60px;" alt=""/><br /><sub><b>Alex Villarreal</b></sub></a><br /><a href="https://github.com/isomorphic-git/isomorphic-git/commits?author=alexvy86" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/amrc-benmorrow"><img src="https://avatars.githubusercontent.com/u/120477944?v=4?s=60" width="60px;" alt=""/><br /><sub><b>Ben Morrow</b></sub></a><br /><a href="https://github.com/isomorphic-git/isomorphic-git/commits?author=amrc-benmorrow" title="Code">💻</a></td>
   </tr>
 </table>
 

package/browser-tests.json

@@ -1,7 +1,7 @@
 [
   "Chrome Headless 79.0.3945.0 (Linux x86_64)",
-  "Firefox 124.0 (Ubuntu 0.0.0)",
-  "Chrome 120.0.0.0 (Android 10)",
+  "Firefox 125.0 (Ubuntu 0.0.0)",
+  "Chrome 123.0.0.0 (Android 10)",
   "Edge 79.0.309.65 (Windows 10)",
   "Mobile Safari 13.0 (iOS 13.0)",
   "Safari 13.1 (Mac OS 10.15.4)"

package/index.cjs

@@ -907,18 +907,18 @@ class GitIndex {
   }
 }
 
-function compareStats(entry, stats) {
+function compareStats(entry, stats, filemode = true, trustino = true) {
   // Comparison based on the description in Paragraph 4 of
   // https://www.kernel.org/pub/software/scm/git/docs/technical/racy-git.txt
   const e = normalizeStats(entry);
   const s = normalizeStats(stats);
   const staleness =
-    e.mode !== s.mode ||
+    (filemode && e.mode !== s.mode) ||
     e.mtimeSeconds !== s.mtimeSeconds ||
     e.ctimeSeconds !== s.ctimeSeconds ||
     e.uid !== s.uid ||
     e.gid !== s.gid ||
-    e.ino !== s.ino ||
+    (trustino && e.ino !== s.ino) ||
     e.size !== s.size;
   return staleness
 }
@@ -1623,26 +1623,28 @@ class GitConfig {
   constructor(text) {
     let section = null;
     let subsection = null;
-    this.parsedConfig = text.split('\n').map(line => {
-      let name = null;
-      let value = null;
-
-      const trimmedLine = line.trim();
-      const extractedSection = extractSectionLine(trimmedLine);
-      const isSection = extractedSection != null;
-      if (isSection) {
-        ;[section, subsection] = extractedSection;
-      } else {
-        const extractedVariable = extractVariableLine(trimmedLine);
-        const isVariable = extractedVariable != null;
-        if (isVariable) {
-          ;[name, value] = extractedVariable;
-        }
-      }
+    this.parsedConfig = text
+      ? text.split('\n').map(line => {
+          let name = null;
+          let value = null;
+
+          const trimmedLine = line.trim();
+          const extractedSection = extractSectionLine(trimmedLine);
+          const isSection = extractedSection != null;
+          if (isSection) {
+            ;[section, subsection] = extractedSection;
+          } else {
+            const extractedVariable = extractVariableLine(trimmedLine);
+            const isVariable = extractedVariable != null;
+            if (isVariable) {
+              ;[name, value] = extractedVariable;
+            }
+          }
 
-      const path = getPath(section, subsection, name);
-      return { line, isSection, section, subsection, name, value, path }
-    });
+          const path = getPath(section, subsection, name);
+          return { line, isSection, section, subsection, name, value, path }
+        })
+      : [];
   }
 
   static from(text) {
@@ -4175,17 +4177,22 @@ class GitWalkerFs {
 
   async content(entry) {
     if (entry._content === false) {
-      const { fs, dir } = this;
+      const { fs, dir, gitdir } = this;
       if ((await entry.type()) === 'tree') {
         entry._content = undefined;
       } else {
-        const content = await fs.read(`${dir}/${entry._fullpath}`);
+        const config = await GitConfigManager.get({ fs, gitdir });
+        const autocrlf = (await config.get('core.autocrlf')) || false;
+        const content = await fs.read(`${dir}/${entry._fullpath}`, {
+          encoding: 'utf8',
+          autocrlf,
+        });
         // workaround for a BrowserFS edge case
         entry._actualSize = content.length;
         if (entry._stat && entry._stat.size === -1) {
           entry._stat.size = entry._actualSize;
         }
-        entry._content = new Uint8Array(content);
+        entry._content = new TextEncoder().encode(content);
       }
     }
     return entry._content
@@ -4201,7 +4208,10 @@ class GitWalkerFs {
       ) {
         const stage = index.entriesMap.get(entry._fullpath);
         const stats = await entry.stat();
-        if (!stage || compareStats(stats, stage)) {
+        const config = await GitConfigManager.get({ fs, gitdir });
+        const filemode = await config.get('core.filemode');
+        const trustino = !(process.platform === 'win32');
+        if (!stage || compareStats(stats, stage, filemode, trustino)) {
           const content = await entry.content();
           if (content === undefined) {
             oid = undefined;
@@ -4215,8 +4225,8 @@ class GitWalkerFs {
             if (
               stage &&
               oid === stage.oid &&
-              stats.mode === stage.mode &&
-              compareStats(stats, stage)
+              (!filemode || stats.mode === stage.mode) &&
+              compareStats(stats, stage, filemode, trustino)
             ) {
               index.insert({
                 filepath: entry._fullpath,
@@ -4553,6 +4563,9 @@ class FileSystem {
   async read(filepath, options = {}) {
     try {
       let buffer = await this._readFile(filepath, options);
+      if (typeof buffer === 'string' && options.autocrlf) {
+        buffer = buffer.replace(/\r\n/g, '\n');
+      }
       // Convert plain ArrayBuffers to Buffers
       if (typeof buffer !== 'string') {
         buffer = Buffer.from(buffer);
@@ -5083,11 +5096,21 @@ async function addToIndex({
         }
       }
     } else {
+      const config = await GitConfigManager.get({ fs, gitdir });
+      const autocrlf = (await config.get('core.autocrlf')) || false;
       const object = stats.isSymbolicLink()
         ? await fs.readlink(join(dir, currentFilepath)).then(posixifyPathBuffer)
-        : await fs.read(join(dir, currentFilepath));
+        : await fs.read(join(dir, currentFilepath), {
+            encoding: 'utf8',
+            autocrlf,
+          });
       if (object === null) throw new NotFoundError(currentFilepath)
-      const oid = await _writeObject({ fs, gitdir, type: 'blob', object });
+      const oid = await _writeObject({
+        fs,
+        gitdir,
+        type: 'blob',
+        object: new TextEncoder().encode(object),
+      });
       index.insert({ filepath: currentFilepath, stats, oid });
     }
   });
@@ -7362,8 +7385,8 @@ function filterCapabilities(server, client) {
 
 const pkg = {
   name: 'isomorphic-git',
-  version: '1.25.7',
-  agent: 'git/isomorphic-git@1.25.7',
+  version: '1.25.8',
+  agent: 'git/isomorphic-git@1.25.8',
 };
 
 class FIFO {

package/index.js

@@ -901,18 +901,18 @@ class GitIndex {
   }
 }
 
-function compareStats(entry, stats) {
+function compareStats(entry, stats, filemode = true, trustino = true) {
   // Comparison based on the description in Paragraph 4 of
   // https://www.kernel.org/pub/software/scm/git/docs/technical/racy-git.txt
   const e = normalizeStats(entry);
   const s = normalizeStats(stats);
   const staleness =
-    e.mode !== s.mode ||
+    (filemode && e.mode !== s.mode) ||
     e.mtimeSeconds !== s.mtimeSeconds ||
     e.ctimeSeconds !== s.ctimeSeconds ||
     e.uid !== s.uid ||
     e.gid !== s.gid ||
-    e.ino !== s.ino ||
+    (trustino && e.ino !== s.ino) ||
     e.size !== s.size;
   return staleness
 }
@@ -1617,26 +1617,28 @@ class GitConfig {
   constructor(text) {
     let section = null;
     let subsection = null;
-    this.parsedConfig = text.split('\n').map(line => {
-      let name = null;
-      let value = null;
-
-      const trimmedLine = line.trim();
-      const extractedSection = extractSectionLine(trimmedLine);
-      const isSection = extractedSection != null;
-      if (isSection) {
-        ;[section, subsection] = extractedSection;
-      } else {
-        const extractedVariable = extractVariableLine(trimmedLine);
-        const isVariable = extractedVariable != null;
-        if (isVariable) {
-          ;[name, value] = extractedVariable;
-        }
-      }
+    this.parsedConfig = text
+      ? text.split('\n').map(line => {
+          let name = null;
+          let value = null;
+
+          const trimmedLine = line.trim();
+          const extractedSection = extractSectionLine(trimmedLine);
+          const isSection = extractedSection != null;
+          if (isSection) {
+            ;[section, subsection] = extractedSection;
+          } else {
+            const extractedVariable = extractVariableLine(trimmedLine);
+            const isVariable = extractedVariable != null;
+            if (isVariable) {
+              ;[name, value] = extractedVariable;
+            }
+          }
 
-      const path = getPath(section, subsection, name);
-      return { line, isSection, section, subsection, name, value, path }
-    });
+          const path = getPath(section, subsection, name);
+          return { line, isSection, section, subsection, name, value, path }
+        })
+      : [];
   }
 
   static from(text) {
@@ -4169,17 +4171,22 @@ class GitWalkerFs {
 
   async content(entry) {
     if (entry._content === false) {
-      const { fs, dir } = this;
+      const { fs, dir, gitdir } = this;
       if ((await entry.type()) === 'tree') {
         entry._content = undefined;
       } else {
-        const content = await fs.read(`${dir}/${entry._fullpath}`);
+        const config = await GitConfigManager.get({ fs, gitdir });
+        const autocrlf = (await config.get('core.autocrlf')) || false;
+        const content = await fs.read(`${dir}/${entry._fullpath}`, {
+          encoding: 'utf8',
+          autocrlf,
+        });
         // workaround for a BrowserFS edge case
         entry._actualSize = content.length;
         if (entry._stat && entry._stat.size === -1) {
           entry._stat.size = entry._actualSize;
         }
-        entry._content = new Uint8Array(content);
+        entry._content = new TextEncoder().encode(content);
       }
     }
     return entry._content
@@ -4195,7 +4202,10 @@ class GitWalkerFs {
       ) {
         const stage = index.entriesMap.get(entry._fullpath);
         const stats = await entry.stat();
-        if (!stage || compareStats(stats, stage)) {
+        const config = await GitConfigManager.get({ fs, gitdir });
+        const filemode = await config.get('core.filemode');
+        const trustino = !(process.platform === 'win32');
+        if (!stage || compareStats(stats, stage, filemode, trustino)) {
           const content = await entry.content();
           if (content === undefined) {
             oid = undefined;
@@ -4209,8 +4219,8 @@ class GitWalkerFs {
             if (
               stage &&
               oid === stage.oid &&
-              stats.mode === stage.mode &&
-              compareStats(stats, stage)
+              (!filemode || stats.mode === stage.mode) &&
+              compareStats(stats, stage, filemode, trustino)
             ) {
               index.insert({
                 filepath: entry._fullpath,
@@ -4547,6 +4557,9 @@ class FileSystem {
   async read(filepath, options = {}) {
     try {
       let buffer = await this._readFile(filepath, options);
+      if (typeof buffer === 'string' && options.autocrlf) {
+        buffer = buffer.replace(/\r\n/g, '\n');
+      }
       // Convert plain ArrayBuffers to Buffers
       if (typeof buffer !== 'string') {
         buffer = Buffer.from(buffer);
@@ -5077,11 +5090,21 @@ async function addToIndex({
         }
       }
     } else {
+      const config = await GitConfigManager.get({ fs, gitdir });
+      const autocrlf = (await config.get('core.autocrlf')) || false;
       const object = stats.isSymbolicLink()
         ? await fs.readlink(join(dir, currentFilepath)).then(posixifyPathBuffer)
-        : await fs.read(join(dir, currentFilepath));
+        : await fs.read(join(dir, currentFilepath), {
+            encoding: 'utf8',
+            autocrlf,
+          });
       if (object === null) throw new NotFoundError(currentFilepath)
-      const oid = await _writeObject({ fs, gitdir, type: 'blob', object });
+      const oid = await _writeObject({
+        fs,
+        gitdir,
+        type: 'blob',
+        object: new TextEncoder().encode(object),
+      });
       index.insert({ filepath: currentFilepath, stats, oid });
     }
   });
@@ -7356,8 +7379,8 @@ function filterCapabilities(server, client) {
 
 const pkg = {
   name: 'isomorphic-git',
-  version: '1.25.7',
-  agent: 'git/isomorphic-git@1.25.7',
+  version: '1.25.8',
+  agent: 'git/isomorphic-git@1.25.8',
 };
 
 class FIFO {