isomorphic-git 1.25.6 → 1.25.8

package/README.md

@@ -368,6 +368,8 @@ Thanks goes to these wonderful people ([emoji key](https://github.com/kentcdodds
     <td align="center"><a href="https://api.github.com/users/hisco"><img src="https://avatars.githubusercontent.com/u/39222286?v=4?s=60" width="60px;" alt=""/><br /><sub><b>Eyal Hisco</b></sub></a><br /><a href="https://github.com/isomorphic-git/isomorphic-git/issues?q=author%3Ahisco" title="Bug reports">🐛</a></td>
     <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,8 +1,8 @@
 [
   "Chrome Headless 79.0.3945.0 (Linux x86_64)",
-  "Firefox 122.0 (Ubuntu 0.0.0)",
-  "Chrome 120.0.0.0 (Android 10)",
-  "Mobile Safari 13.0 (iOS 13.0)",
+  "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) {
@@ -1796,6 +1798,13 @@ const refpaths = ref => [
 // @see https://git-scm.com/docs/gitrepository-layout
 const GIT_FILES = ['config', 'description', 'index', 'shallow', 'commondir'];
 
+let lock$1;
+
+async function acquireLock(ref, callback) {
+  if (lock$1 === undefined) lock$1 = new AsyncLock();
+  return lock$1.acquire(ref, callback)
+}
+
 class GitRefManager {
   static async updateRemoteRefs({
     fs,
@@ -1902,7 +1911,9 @@ class GitRefManager {
     // are .git/refs/remotes/origin/refs/remotes/remote_mirror_3059
     // and .git/refs/remotes/origin/refs/merge-requests
     for (const [key, value] of actualRefsToWrite) {
-      await fs.write(join(gitdir, key), `${value.trim()}\n`, 'utf8');
+      await acquireLock(key, async () =>
+        fs.write(join(gitdir, key), `${value.trim()}\n`, 'utf8')
+      );
     }
     return { pruned }
   }
@@ -1913,11 +1924,15 @@ class GitRefManager {
     if (!value.match(/[0-9a-f]{40}/)) {
       throw new InvalidOidError(value)
     }
-    await fs.write(join(gitdir, ref), `${value.trim()}\n`, 'utf8');
+    await acquireLock(ref, async () =>
+      fs.write(join(gitdir, ref), `${value.trim()}\n`, 'utf8')
+    );
   }
 
   static async writeSymbolicRef({ fs, gitdir, ref, value }) {
-    await fs.write(join(gitdir, ref), 'ref: ' + `${value.trim()}\n`, 'utf8');
+    await acquireLock(ref, async () =>
+      fs.write(join(gitdir, ref), 'ref: ' + `${value.trim()}\n`, 'utf8')
+    );
   }
 
   static async deleteRef({ fs, gitdir, ref }) {
@@ -1928,7 +1943,9 @@ class GitRefManager {
     // Delete regular ref
     await Promise.all(refs.map(ref => fs.rm(join(gitdir, ref))));
     // Delete any packed ref
-    let text = await fs.read(`${gitdir}/packed-refs`, { encoding: 'utf8' });
+    let text = await acquireLock('packed-refs', async () =>
+      fs.read(`${gitdir}/packed-refs`, { encoding: 'utf8' })
+    );
     const packed = GitPackedRefs.from(text);
     const beforeSize = packed.refs.size;
     for (const ref of refs) {
@@ -1938,7 +1955,9 @@ class GitRefManager {
     }
     if (packed.refs.size < beforeSize) {
       text = packed.toString();
-      await fs.write(`${gitdir}/packed-refs`, text, { encoding: 'utf8' });
+      await acquireLock('packed-refs', async () =>
+        fs.write(`${gitdir}/packed-refs`, text, { encoding: 'utf8' })
+      );
     }
   }
 
@@ -1957,7 +1976,7 @@ class GitRefManager {
         return ref
       }
     }
-    let sha;
+
     // Is it a ref pointer?
     if (ref.startsWith('ref: ')) {
       ref = ref.slice('ref: '.length);
@@ -1973,9 +1992,12 @@ class GitRefManager {
     const allpaths = refpaths(ref).filter(p => !GIT_FILES.includes(p)); // exclude git system files (#709)
 
     for (const ref of allpaths) {
-      sha =
-        (await fs.read(`${gitdir}/${ref}`, { encoding: 'utf8' })) ||
-        packedMap.get(ref);
+      const sha = await acquireLock(
+        ref,
+        async () =>
+          (await fs.read(`${gitdir}/${ref}`, { encoding: 'utf8' })) ||
+          packedMap.get(ref)
+      );
       if (sha) {
         return GitRefManager.resolve({ fs, gitdir, ref: sha.trim(), depth })
       }
@@ -2003,7 +2025,10 @@ class GitRefManager {
     // Look in all the proper paths, in this order
     const allpaths = refpaths(ref);
     for (const ref of allpaths) {
-      if (await fs.exists(`${gitdir}/${ref}`)) return ref
+      const refExists = await acquireLock(ref, async () =>
+        fs.exists(`${gitdir}/${ref}`)
+      );
+      if (refExists) return ref
       if (packedMap.has(ref)) return ref
     }
     // Do we give up?
@@ -2054,7 +2079,9 @@ class GitRefManager {
   }
 
   static async packedRefs({ fs, gitdir }) {
-    const text = await fs.read(`${gitdir}/packed-refs`, { encoding: 'utf8' });
+    const text = await acquireLock('packed-refs', async () =>
+      fs.read(`${gitdir}/packed-refs`, { encoding: 'utf8' })
+    );
     const packed = GitPackedRefs.from(text);
     return packed.refs
   }
@@ -4150,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
@@ -4176,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;
@@ -4190,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,
@@ -4528,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);
@@ -5058,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 });
     }
   });
@@ -6929,14 +6977,17 @@ async function parseRefsAdResponse(stream, { service }) {
 
   const [firstRef, capabilitiesLine] = splitAndAssert(lineTwo, '\x00', '\\x00');
   capabilitiesLine.split(' ').map(x => capabilities.add(x));
-  const [ref, name] = splitAndAssert(firstRef, ' ', ' ');
-  refs.set(name, ref);
-  while (true) {
-    const line = await read();
-    if (line === true) break
-    if (line !== null) {
-      const [ref, name] = splitAndAssert(line.toString('utf8'), ' ', ' ');
-      refs.set(name, ref);
+  // see no-refs in https://git-scm.com/docs/pack-protocol#_reference_discovery (since git 2.41.0)
+  if (firstRef !== '0000000000000000000000000000000000000000 capabilities^{}') {
+    const [ref, name] = splitAndAssert(firstRef, ' ', ' ');
+    refs.set(name, ref);
+    while (true) {
+      const line = await read();
+      if (line === true) break
+      if (line !== null) {
+        const [ref, name] = splitAndAssert(line.toString('utf8'), ' ', ' ');
+        refs.set(name, ref);
+      }
     }
   }
   // Symrefs are thrown into the "capabilities" unfortunately.
@@ -7216,14 +7267,14 @@ class GitRemoteManager {
   }
 }
 
-let lock$1 = null;
+let lock$2 = null;
 
 class GitShallowManager {
   static async read({ fs, gitdir }) {
-    if (lock$1 === null) lock$1 = new AsyncLock();
+    if (lock$2 === null) lock$2 = new AsyncLock();
     const filepath = join(gitdir, 'shallow');
     const oids = new Set();
-    await lock$1.acquire(filepath, async function() {
+    await lock$2.acquire(filepath, async function() {
       const text = await fs.read(filepath, { encoding: 'utf8' });
       if (text === null) return oids // no file
       if (text.trim() === '') return oids // empty file
@@ -7236,18 +7287,18 @@ class GitShallowManager {
   }
 
   static async write({ fs, gitdir, oids }) {
-    if (lock$1 === null) lock$1 = new AsyncLock();
+    if (lock$2 === null) lock$2 = new AsyncLock();
     const filepath = join(gitdir, 'shallow');
     if (oids.size > 0) {
       const text = [...oids].join('\n') + '\n';
-      await lock$1.acquire(filepath, async function() {
+      await lock$2.acquire(filepath, async function() {
         await fs.write(filepath, text, {
           encoding: 'utf8',
         });
       });
     } else {
       // No shallows
-      await lock$1.acquire(filepath, async function() {
+      await lock$2.acquire(filepath, async function() {
         await fs.rm(filepath);
       });
     }
@@ -7334,8 +7385,8 @@ function filterCapabilities(server, client) {
 
 const pkg = {
   name: 'isomorphic-git',
-  version: '1.25.6',
-  agent: 'git/isomorphic-git@1.25.6',
+  version: '1.25.8',
+  agent: 'git/isomorphic-git@1.25.8',
 };
 
 class FIFO {
@@ -13887,6 +13938,8 @@ async function getHeadTree({ fs, cache, gitdir }) {
  *   ["g.txt", 1, 2, 3], // modified, staged, with unstaged changes
  *   ["h.txt", 1, 0, 1], // deleted, unstaged
  *   ["i.txt", 1, 0, 0], // deleted, staged
+ *   ["j.txt", 1, 2, 0], // deleted, staged, with unstaged-modified changes (new file of the same name)
+ *   ["k.txt", 1, 1, 0], // deleted, staged, with unstaged changes (new file of the same name)
  * ]
  * ```
  *

package/index.d.ts

@@ -3094,6 +3094,8 @@ export function status({ fs: _fs, dir, gitdir, filepath, cache, }: {
  *   ["g.txt", 1, 2, 3], // modified, staged, with unstaged changes
  *   ["h.txt", 1, 0, 1], // deleted, unstaged
  *   ["i.txt", 1, 0, 0], // deleted, staged
+ *   ["j.txt", 1, 2, 0], // deleted, staged, with unstaged-modified changes (new file of the same name)
+ *   ["k.txt", 1, 1, 0], // deleted, staged, with unstaged changes (new file of the same name)
  * ]
  * ```
  *