isomorphic-git 1.9.1 → 1.10.2

package/README.md

@@ -168,6 +168,7 @@ unless there is a major version bump.
 - [indexPack](https://isomorphic-git.github.io/docs/indexPack.html)
 - [init](https://isomorphic-git.github.io/docs/init.html)
 - [isDescendent](https://isomorphic-git.github.io/docs/isDescendent.html)
+- [isIgnored](https://isomorphic-git.github.io/docs/isIgnored.html)
 - [listBranches](https://isomorphic-git.github.io/docs/listBranches.html)
 - [listFiles](https://isomorphic-git.github.io/docs/listFiles.html)
 - [listNotes](https://isomorphic-git.github.io/docs/listNotes.html)
@@ -321,21 +322,23 @@ Thanks goes to these wonderful people ([emoji key](https://github.com/kentcdodds
     <td align="center"><a href="http://eaf4.com"><img src="https://avatars0.githubusercontent.com/u/319282?v=4?s=60" width="60px;" alt=""/><br /><sub><b>Edward Faulkner</b></sub></a><br /><a href="https://github.com/isomorphic-git/isomorphic-git/commits?author=ef4" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/KSXGitHub"><img src="https://avatars2.githubusercontent.com/u/11488886?v=4?s=60" width="60px;" alt=""/><br /><sub><b>Khải</b></sub></a><br /><a href="https://github.com/isomorphic-git/isomorphic-git/issues?q=author%3AKSXGitHub" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://crutchcorn.dev/"><img src="https://avatars0.githubusercontent.com/u/9100169?v=4?s=60" width="60px;" alt=""/><br /><sub><b>Corbin Crutchley</b></sub></a><br /><a href="https://github.com/isomorphic-git/isomorphic-git/commits?author=crutchcorn" title="Code">💻</a> <a href="https://github.com/isomorphic-git/isomorphic-git/commits?author=crutchcorn" title="Documentation">📖</a> <a href="https://github.com/isomorphic-git/isomorphic-git/commits?author=crutchcorn" title="Tests">⚠️</a></td>
-    <td align="center"><a href="https://onetwo.ren/"><img src="https://avatars1.githubusercontent.com/u/3746270?v=4?s=60" width="60px;" alt=""/><br /><sub><b>lin onetwo</b></sub></a><br /><a href="https://github.com/isomorphic-git/isomorphic-git/commits?author=linonetwo" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/snowyu"><img src="https://avatars1.githubusercontent.com/u/327887?v=4?s=60" width="60px;" alt=""/><br /><sub><b>Riceball LEE</b></sub></a><br /><a href="https://github.com/isomorphic-git/isomorphic-git/commits?author=snowyu" title="Code">💻</a> <a href="https://github.com/isomorphic-git/isomorphic-git/commits?author=snowyu" title="Documentation">📖</a> <a href="https://github.com/isomorphic-git/isomorphic-git/commits?author=snowyu" title="Tests">⚠️</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://onetwo.ren/"><img src="https://avatars1.githubusercontent.com/u/3746270?v=4?s=60" width="60px;" alt=""/><br /><sub><b>lin onetwo</b></sub></a><br /><a href="https://github.com/isomorphic-git/isomorphic-git/commits?author=linonetwo" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/linfaxin"><img src="https://avatars2.githubusercontent.com/u/3705017?v=4?s=60" width="60px;" alt=""/><br /><sub><b>林法鑫</b></sub></a><br /><a href="https://github.com/isomorphic-git/isomorphic-git/issues?q=author%3Alinfaxin" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/snowyu"><img src="https://avatars1.githubusercontent.com/u/327887?v=4?s=60" width="60px;" alt=""/><br /><sub><b>Riceball LEE</b></sub></a><br /><a href="https://github.com/isomorphic-git/isomorphic-git/commits?author=snowyu" title="Code">💻</a> <a href="https://github.com/isomorphic-git/isomorphic-git/commits?author=snowyu" title="Documentation">📖</a> <a href="https://github.com/isomorphic-git/isomorphic-git/commits?author=snowyu" title="Tests">⚠️</a></td>
     <td align="center"><a href="https://github.com/willstott101"><img src="https://avatars2.githubusercontent.com/u/335152?v=4?s=60" width="60px;" alt=""/><br /><sub><b>Will Stott</b></sub></a><br /><a href="https://github.com/isomorphic-git/isomorphic-git/commits?author=willstott101" title="Code">💻</a> <a href="https://github.com/isomorphic-git/isomorphic-git/commits?author=willstott101" title="Tests">⚠️</a></td>
     <td align="center"><a href="http://mtnspring.org/"><img src="https://avatars2.githubusercontent.com/u/223277?v=4?s=60" width="60px;" alt=""/><br /><sub><b>Seth Nickell</b></sub></a><br /><a href="https://github.com/isomorphic-git/isomorphic-git/issues?q=author%3Asnickell" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://www.alextitarenko.me/"><img src="https://avatars0.githubusercontent.com/u/3290313?v=4?s=60" width="60px;" alt=""/><br /><sub><b>Alex Titarenko</b></sub></a><br /><a href="https://github.com/isomorphic-git/isomorphic-git/commits?author=alex-titarenko" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/mmkal"><img src="https://avatars2.githubusercontent.com/u/15040698?v=4?s=60" width="60px;" alt=""/><br /><sub><b>Misha Kaletsky</b></sub></a><br /><a href="https://github.com/isomorphic-git/isomorphic-git/commits?author=mmkal" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/rczulch"><img src="https://avatars1.githubusercontent.com/u/54646976?v=4?s=60" width="60px;" alt=""/><br /><sub><b>Richard C. Zulch</b></sub></a><br /><a href="https://github.com/isomorphic-git/isomorphic-git/commits?author=rczulch" title="Code">💻</a> <a href="https://github.com/isomorphic-git/isomorphic-git/commits?author=rczulch" title="Documentation">📖</a></td>
-    <td align="center"><a href="https://scrapbox.io/mkizka/README"><img src="https://avatars.githubusercontent.com/u/30231179?v=4?s=60" width="60px;" alt=""/><br /><sub><b>mkizka</b></sub></a><br /><a href="https://github.com/isomorphic-git/isomorphic-git/commits?author=mkizka" title="Code">💻</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://scrapbox.io/mkizka/README"><img src="https://avatars.githubusercontent.com/u/30231179?v=4?s=60" width="60px;" alt=""/><br /><sub><b>mkizka</b></sub></a><br /><a href="https://github.com/isomorphic-git/isomorphic-git/commits?author=mkizka" title="Code">💻</a></td>
     <td align="center"><a href="https://ryotak.me/"><img src="https://avatars.githubusercontent.com/u/49341894?v=4?s=60" width="60px;" alt=""/><br /><sub><b>RyotaK</b></sub></a><br /><a href="https://github.com/isomorphic-git/isomorphic-git/issues?q=author%3ARy0taK" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/strangedev"><img src="https://avatars.githubusercontent.com/u/3045979?v=4?s=60" width="60px;" alt=""/><br /><sub><b>Noah Hummel</b></sub></a><br /><a href="https://github.com/isomorphic-git/isomorphic-git/commits?author=strangedev" title="Code">💻</a> <a href="https://github.com/isomorphic-git/isomorphic-git/commits?author=strangedev" title="Tests">⚠️</a></td>
+    <td align="center"><a href="https://github.com/mtlewis"><img src="https://avatars.githubusercontent.com/u/542836?v=4?s=60" width="60px;" alt=""/><br /><sub><b>Mike Lewis</b></sub></a><br /><a href="https://github.com/isomorphic-git/isomorphic-git/commits?author=mtlewis" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://twitter.com/SamVerschueren"><img src="https://avatars.githubusercontent.com/u/1913805?v=4?s=60" width="60px;" alt=""/><br /><sub><b>Sam Verschueren</b></sub></a><br /><a href="https://github.com/isomorphic-git/isomorphic-git/commits?author=SamVerschueren" title="Code">💻</a></td>
   </tr>
 </table>
 

package/browser-tests.json

@@ -1,8 +1,8 @@
 [
   "HeadlessChrome 0.0.0 (Linux 0.0.0)",
-  "Firefox 89.0.0 (Ubuntu 0.0.0)",
-  "Chrome Mobile 89.0.4389 (Android 0.0.0)",
-  "Chrome 79.0.3945 (Windows 10 0.0.0)",
+  "Firefox 94.0.0 (Ubuntu 0.0.0)",
   "Safari 13.1.0 (Mac OS X 10.15.4)",
-  "Mobile Safari 13.0.0 (iOS 13.0.0)"
+  "Chrome 79.0.3945 (Windows 10 0.0.0)",
+  "Mobile Safari 13.0.0 (iOS 13.0.0)",
+  "Chrome Mobile 94.0.4606 (Android 0.0.0)"
 ]

package/index.cjs

@@ -1694,8 +1694,8 @@ class GitRefManager {
         if (serverRef.startsWith('refs/tags') && !serverRef.endsWith('^{}')) {
           // Git's behavior is to only fetch tags that do not conflict with tags already present.
           if (!(await GitRefManager.exists({ fs, gitdir, ref: serverRef }))) {
-            // If there is a dereferenced an annotated tag value available, prefer that.
-            const oid = refs.get(serverRef + '^{}') || refs.get(serverRef);
+            // Always use the object id of the tag itself, and not the peeled object id.
+            const oid = refs.get(serverRef);
             actualRefsToWrite.set(serverRef, oid);
           }
         }
@@ -2405,7 +2405,7 @@ async function listpack(stream, onData) {
     const inflator = new pako.Inflate();
     while (!inflator.result) {
       const chunk = await reader.chunk();
-      if (reader.ended) break
+      if (!chunk) break
       inflator.push(chunk, false);
       if (inflator.err) {
         throw new InternalError(`Pako error: ${inflator.msg}`)
@@ -4069,6 +4069,33 @@ class GitIgnoreManager {
   }
 }
 
+/**
+ * Removes the directory at the specified filepath recursively. Used internally to replicate the behavior of
+ * fs.promises.rm({ recursive: true, force: true }) from Node.js 14 and above when not available. If the provided
+ * filepath resolves to a file, it will be removed.
+ *
+ * @param {import('../models/FileSystem.js').FileSystem} fs
+ * @param {string} filepath - The file or directory to remove.
+ */
+async function rmRecursive(fs, filepath) {
+  const entries = await fs.readdir(filepath);
+  if (entries == null) {
+    await fs.rm(filepath);
+  } else if (entries.length) {
+    await Promise.all(
+      entries.map(entry => {
+        const subpath = join(filepath, entry);
+        return fs.lstat(subpath).then(stat => {
+          if (!stat) return
+          return stat.isDirectory() ? rmRecursive(fs, subpath) : fs.rm(subpath)
+        })
+      })
+    ).then(() => fs.rmdir(filepath));
+  } else {
+    await fs.rmdir(filepath);
+  }
+}
+
 /**
  * This is just a collection of helper functions really. At least that's how it started.
  */
@@ -4081,6 +4108,13 @@ class FileSystem {
       this._readFile = fs.promises.readFile.bind(fs.promises);
       this._writeFile = fs.promises.writeFile.bind(fs.promises);
       this._mkdir = fs.promises.mkdir.bind(fs.promises);
+      if (fs.promises.rm) {
+        this._rm = fs.promises.rm.bind(fs.promises);
+      } else if (fs.promises.rmdir.length > 1) {
+        this._rm = fs.promises.rmdir.bind(fs.promises);
+      } else {
+        this._rm = rmRecursive.bind(null, this);
+      }
       this._rmdir = fs.promises.rmdir.bind(fs.promises);
       this._unlink = fs.promises.unlink.bind(fs.promises);
       this._stat = fs.promises.stat.bind(fs.promises);
@@ -4092,6 +4126,13 @@ class FileSystem {
       this._readFile = pify(fs.readFile.bind(fs));
       this._writeFile = pify(fs.writeFile.bind(fs));
       this._mkdir = pify(fs.mkdir.bind(fs));
+      if (fs.rm) {
+        this._rm = pify(fs.rm.bind(fs));
+      } else if (fs.rmdir.length > 2) {
+        this._rm = pify(fs.rmdir.bind(fs));
+      } else {
+        this._rm = rmRecursive.bind(null, this);
+      }
       this._rmdir = pify(fs.rmdir.bind(fs));
       this._unlink = pify(fs.unlink.bind(fs));
       this._stat = pify(fs.stat.bind(fs));
@@ -4200,9 +4241,13 @@ class FileSystem {
   /**
    * Delete a directory without throwing an error if it is already deleted.
    */
-  async rmdir(filepath) {
+  async rmdir(filepath, opts) {
     try {
-      await this._rmdir(filepath);
+      if (opts && opts.recursive) {
+        await this._rm(filepath, opts);
+      } else {
+        await this._rmdir(filepath);
+      }
     } catch (err) {
       if (err.code !== 'ENOENT') throw err
     }
@@ -6380,7 +6425,14 @@ async function parseRefsAdResponse(stream, { service }) {
   let lineOne = await read();
   // skip past any flushes
   while (lineOne === null) lineOne = await read();
+
   if (lineOne === true) throw new EmptyServerResponseError()
+
+  // Handle protocol v2 responses (Bitbucket Server doesn't include a `# service=` line)
+  if (lineOne.includes('version 2')) {
+    return parseCapabilitiesV2(read)
+  }
+
   // Clients MUST ignore an LF at the end of the line.
   if (lineOne.toString('utf8').replace(/\n$/, '') !== `# service=${service}`) {
     throw new ParseError(`# service=${service}\\n`, lineOne.toString('utf8'))
@@ -6392,10 +6444,12 @@ async function parseRefsAdResponse(stream, { service }) {
   // are returned.
   if (lineTwo === true) return { capabilities, refs, symrefs }
   lineTwo = lineTwo.toString('utf8');
+
   // Handle protocol v2 responses
   if (lineTwo.includes('version 2')) {
     return parseCapabilitiesV2(read)
   }
+
   const [firstRef, capabilitiesLine] = splitAndAssert(lineTwo, '\x00', '\\x00');
   capabilitiesLine.split(' ').map(x => capabilities.add(x));
   const [ref, name] = splitAndAssert(firstRef, ' ', ' ');
@@ -6803,8 +6857,8 @@ function filterCapabilities(server, client) {
 
 const pkg = {
   name: 'isomorphic-git',
-  version: '1.9.1',
-  agent: 'git/isomorphic-git@1.9.1',
+  version: '1.10.2',
+  agent: 'git/isomorphic-git@1.10.2',
 };
 
 class FIFO {
@@ -7518,37 +7572,6 @@ async function _init({
   await fs.write(gitdir + '/HEAD', `ref: refs/heads/${defaultBranch}\n`);
 }
 
-/**
- * @param {object} args
- * @param {import('../models/FileSystem.js').FileSystem} args.fs
- * @param {string} args.dirname
- */
-async function deleteRecursively({ fs, dirname }) {
-  const filesToDelete = [];
-  const directoriesToDelete = [];
-  const pathsToTraverse = [dirname];
-
-  while (pathsToTraverse.length > 0) {
-    const path = pathsToTraverse.pop();
-
-    if ((await fs._stat(path)).isDirectory()) {
-      directoriesToDelete.push(path);
-      pathsToTraverse.push(
-        ...(await fs.readdir(path)).map(subPath => join(path, subPath))
-      );
-    } else {
-      filesToDelete.push(path);
-    }
-  }
-
-  for (const path of filesToDelete) {
-    await fs.rm(path);
-  }
-  for (const path of directoriesToDelete.reverse()) {
-    await fs.rmdir(path);
-  }
-}
-
 // @ts-check
 
 /**
@@ -7648,14 +7671,11 @@ async function _clone({
     });
   } catch (err) {
     // Remove partial local repository, see #1283
-    try {
-      await deleteRecursively({ fs, dirname: gitdir });
-    } catch (err) {
-      // Ignore this error, we are already failing.
-      // This try-catch is necessary so the original error is
-      // not masked by potential errors in deleteRecursively.
-    }
-
+    // Ignore any error as we are already failing.
+    // The catch is necessary so the original error is not masked.
+    await fs
+      .rmdir(gitdir, { recursive: true, maxRetries: 10 })
+      .catch(() => undefined);
     throw err
   }
 }
@@ -9866,6 +9886,47 @@ async function isDescendent({
 
 // @ts-check
 
+/**
+ * Test whether a filepath should be ignored (because of .gitignore or .git/exclude)
+ *
+ * @param {object} args
+ * @param {FsClient} args.fs - a file system client
+ * @param {string} args.dir - The [working tree](dir-vs-gitdir.md) directory path
+ * @param {string} [args.gitdir=join(dir, '.git')] - [required] The [git directory](dir-vs-gitdir.md) path
+ * @param {string} args.filepath - The filepath to test
+ *
+ * @returns {Promise<boolean>} Resolves to true if the file should be ignored
+ *
+ * @example
+ * await git.isIgnored({ fs, dir: '/tutorial', filepath: 'docs/add.md' })
+ *
+ */
+async function isIgnored({
+  fs,
+  dir,
+  gitdir = join(dir, '.git'),
+  filepath,
+}) {
+  try {
+    assertParameter('fs', fs);
+    assertParameter('dir', dir);
+    assertParameter('gitdir', gitdir);
+    assertParameter('filepath', filepath);
+
+    return GitIgnoreManager.isIgnored({
+      fs: new FileSystem(fs),
+      dir,
+      gitdir,
+      filepath,
+    })
+  } catch (err) {
+    err.caller = 'git.isIgnored';
+    throw err
+  }
+}
+
+// @ts-check
+
 /**
  * List branches
  *
@@ -10560,6 +10621,10 @@ async function _log({
   let lastCommit;
   let isOk;
 
+  function endCommit(commit) {
+    if (isOk && filepath) commits.push(commit);
+  }
+
   while (tips.length > 0) {
     const commit = tips.pop();
 
@@ -10669,10 +10734,6 @@ async function _log({
     tips.sort((a, b) => compareAge(a.commit, b.commit));
   }
   return commits
-
-  function endCommit(commit) {
-    if (isOk && filepath) commits.push(commit);
-  }
 }
 
 // @ts-check
@@ -14083,6 +14144,7 @@ var index = {
   indexPack,
   init,
   isDescendent,
+  isIgnored,
   listBranches,
   listFiles,
   listNotes,
@@ -14150,6 +14212,7 @@ exports.hashBlob = hashBlob;
 exports.indexPack = indexPack;
 exports.init = init;
 exports.isDescendent = isDescendent;
+exports.isIgnored = isIgnored;
 exports.listBranches = listBranches;
 exports.listFiles = listFiles;
 exports.listNotes = listNotes;

package/index.d.ts

@@ -659,6 +659,7 @@ declare namespace index {
     export { indexPack };
     export { init };
     export { isDescendent };
+    export { isIgnored };
     export { listBranches };
     export { listFiles };
     export { listNotes };
@@ -1762,6 +1763,27 @@ export function isDescendent({ fs, dir, gitdir, oid, ancestor, depth, cache, }:
     depth?: number;
     cache?: any;
 }): Promise<boolean>;
+/**
+ * Test whether a filepath should be ignored (because of .gitignore or .git/exclude)
+ *
+ * @param {object} args
+ * @param {FsClient} args.fs - a file system client
+ * @param {string} args.dir - The [working tree](dir-vs-gitdir.md) directory path
+ * @param {string} [args.gitdir=join(dir, '.git')] - [required] The [git directory](dir-vs-gitdir.md) path
+ * @param {string} args.filepath - The filepath to test
+ *
+ * @returns {Promise<boolean>} Resolves to true if the file should be ignored
+ *
+ * @example
+ * await git.isIgnored({ fs, dir: '/tutorial', filepath: 'docs/add.md' })
+ *
+ */
+export function isIgnored({ fs, dir, gitdir, filepath, }: {
+    fs: CallbackFsClient | PromiseFsClient;
+    dir: string;
+    gitdir?: string;
+    filepath: string;
+}): Promise<boolean>;
 /**
  * List branches
  *

package/index.js

@@ -1688,8 +1688,8 @@ class GitRefManager {
         if (serverRef.startsWith('refs/tags') && !serverRef.endsWith('^{}')) {
           // Git's behavior is to only fetch tags that do not conflict with tags already present.
           if (!(await GitRefManager.exists({ fs, gitdir, ref: serverRef }))) {
-            // If there is a dereferenced an annotated tag value available, prefer that.
-            const oid = refs.get(serverRef + '^{}') || refs.get(serverRef);
+            // Always use the object id of the tag itself, and not the peeled object id.
+            const oid = refs.get(serverRef);
             actualRefsToWrite.set(serverRef, oid);
           }
         }
@@ -2399,7 +2399,7 @@ async function listpack(stream, onData) {
     const inflator = new pako.Inflate();
     while (!inflator.result) {
       const chunk = await reader.chunk();
-      if (reader.ended) break
+      if (!chunk) break
       inflator.push(chunk, false);
       if (inflator.err) {
         throw new InternalError(`Pako error: ${inflator.msg}`)
@@ -4063,6 +4063,33 @@ class GitIgnoreManager {
   }
 }
 
+/**
+ * Removes the directory at the specified filepath recursively. Used internally to replicate the behavior of
+ * fs.promises.rm({ recursive: true, force: true }) from Node.js 14 and above when not available. If the provided
+ * filepath resolves to a file, it will be removed.
+ *
+ * @param {import('../models/FileSystem.js').FileSystem} fs
+ * @param {string} filepath - The file or directory to remove.
+ */
+async function rmRecursive(fs, filepath) {
+  const entries = await fs.readdir(filepath);
+  if (entries == null) {
+    await fs.rm(filepath);
+  } else if (entries.length) {
+    await Promise.all(
+      entries.map(entry => {
+        const subpath = join(filepath, entry);
+        return fs.lstat(subpath).then(stat => {
+          if (!stat) return
+          return stat.isDirectory() ? rmRecursive(fs, subpath) : fs.rm(subpath)
+        })
+      })
+    ).then(() => fs.rmdir(filepath));
+  } else {
+    await fs.rmdir(filepath);
+  }
+}
+
 /**
  * This is just a collection of helper functions really. At least that's how it started.
  */
@@ -4075,6 +4102,13 @@ class FileSystem {
       this._readFile = fs.promises.readFile.bind(fs.promises);
       this._writeFile = fs.promises.writeFile.bind(fs.promises);
       this._mkdir = fs.promises.mkdir.bind(fs.promises);
+      if (fs.promises.rm) {
+        this._rm = fs.promises.rm.bind(fs.promises);
+      } else if (fs.promises.rmdir.length > 1) {
+        this._rm = fs.promises.rmdir.bind(fs.promises);
+      } else {
+        this._rm = rmRecursive.bind(null, this);
+      }
       this._rmdir = fs.promises.rmdir.bind(fs.promises);
       this._unlink = fs.promises.unlink.bind(fs.promises);
       this._stat = fs.promises.stat.bind(fs.promises);
@@ -4086,6 +4120,13 @@ class FileSystem {
       this._readFile = pify(fs.readFile.bind(fs));
       this._writeFile = pify(fs.writeFile.bind(fs));
       this._mkdir = pify(fs.mkdir.bind(fs));
+      if (fs.rm) {
+        this._rm = pify(fs.rm.bind(fs));
+      } else if (fs.rmdir.length > 2) {
+        this._rm = pify(fs.rmdir.bind(fs));
+      } else {
+        this._rm = rmRecursive.bind(null, this);
+      }
       this._rmdir = pify(fs.rmdir.bind(fs));
       this._unlink = pify(fs.unlink.bind(fs));
       this._stat = pify(fs.stat.bind(fs));
@@ -4194,9 +4235,13 @@ class FileSystem {
   /**
    * Delete a directory without throwing an error if it is already deleted.
    */
-  async rmdir(filepath) {
+  async rmdir(filepath, opts) {
     try {
-      await this._rmdir(filepath);
+      if (opts && opts.recursive) {
+        await this._rm(filepath, opts);
+      } else {
+        await this._rmdir(filepath);
+      }
     } catch (err) {
       if (err.code !== 'ENOENT') throw err
     }
@@ -6374,7 +6419,14 @@ async function parseRefsAdResponse(stream, { service }) {
   let lineOne = await read();
   // skip past any flushes
   while (lineOne === null) lineOne = await read();
+
   if (lineOne === true) throw new EmptyServerResponseError()
+
+  // Handle protocol v2 responses (Bitbucket Server doesn't include a `# service=` line)
+  if (lineOne.includes('version 2')) {
+    return parseCapabilitiesV2(read)
+  }
+
   // Clients MUST ignore an LF at the end of the line.
   if (lineOne.toString('utf8').replace(/\n$/, '') !== `# service=${service}`) {
     throw new ParseError(`# service=${service}\\n`, lineOne.toString('utf8'))
@@ -6386,10 +6438,12 @@ async function parseRefsAdResponse(stream, { service }) {
   // are returned.
   if (lineTwo === true) return { capabilities, refs, symrefs }
   lineTwo = lineTwo.toString('utf8');
+
   // Handle protocol v2 responses
   if (lineTwo.includes('version 2')) {
     return parseCapabilitiesV2(read)
   }
+
   const [firstRef, capabilitiesLine] = splitAndAssert(lineTwo, '\x00', '\\x00');
   capabilitiesLine.split(' ').map(x => capabilities.add(x));
   const [ref, name] = splitAndAssert(firstRef, ' ', ' ');
@@ -6797,8 +6851,8 @@ function filterCapabilities(server, client) {
 
 const pkg = {
   name: 'isomorphic-git',
-  version: '1.9.1',
-  agent: 'git/isomorphic-git@1.9.1',
+  version: '1.10.2',
+  agent: 'git/isomorphic-git@1.10.2',
 };
 
 class FIFO {
@@ -7512,37 +7566,6 @@ async function _init({
   await fs.write(gitdir + '/HEAD', `ref: refs/heads/${defaultBranch}\n`);
 }
 
-/**
- * @param {object} args
- * @param {import('../models/FileSystem.js').FileSystem} args.fs
- * @param {string} args.dirname
- */
-async function deleteRecursively({ fs, dirname }) {
-  const filesToDelete = [];
-  const directoriesToDelete = [];
-  const pathsToTraverse = [dirname];
-
-  while (pathsToTraverse.length > 0) {
-    const path = pathsToTraverse.pop();
-
-    if ((await fs._stat(path)).isDirectory()) {
-      directoriesToDelete.push(path);
-      pathsToTraverse.push(
-        ...(await fs.readdir(path)).map(subPath => join(path, subPath))
-      );
-    } else {
-      filesToDelete.push(path);
-    }
-  }
-
-  for (const path of filesToDelete) {
-    await fs.rm(path);
-  }
-  for (const path of directoriesToDelete.reverse()) {
-    await fs.rmdir(path);
-  }
-}
-
 // @ts-check
 
 /**
@@ -7642,14 +7665,11 @@ async function _clone({
     });
   } catch (err) {
     // Remove partial local repository, see #1283
-    try {
-      await deleteRecursively({ fs, dirname: gitdir });
-    } catch (err) {
-      // Ignore this error, we are already failing.
-      // This try-catch is necessary so the original error is
-      // not masked by potential errors in deleteRecursively.
-    }
-
+    // Ignore any error as we are already failing.
+    // The catch is necessary so the original error is not masked.
+    await fs
+      .rmdir(gitdir, { recursive: true, maxRetries: 10 })
+      .catch(() => undefined);
     throw err
   }
 }
@@ -9860,6 +9880,47 @@ async function isDescendent({
 
 // @ts-check
 
+/**
+ * Test whether a filepath should be ignored (because of .gitignore or .git/exclude)
+ *
+ * @param {object} args
+ * @param {FsClient} args.fs - a file system client
+ * @param {string} args.dir - The [working tree](dir-vs-gitdir.md) directory path
+ * @param {string} [args.gitdir=join(dir, '.git')] - [required] The [git directory](dir-vs-gitdir.md) path
+ * @param {string} args.filepath - The filepath to test
+ *
+ * @returns {Promise<boolean>} Resolves to true if the file should be ignored
+ *
+ * @example
+ * await git.isIgnored({ fs, dir: '/tutorial', filepath: 'docs/add.md' })
+ *
+ */
+async function isIgnored({
+  fs,
+  dir,
+  gitdir = join(dir, '.git'),
+  filepath,
+}) {
+  try {
+    assertParameter('fs', fs);
+    assertParameter('dir', dir);
+    assertParameter('gitdir', gitdir);
+    assertParameter('filepath', filepath);
+
+    return GitIgnoreManager.isIgnored({
+      fs: new FileSystem(fs),
+      dir,
+      gitdir,
+      filepath,
+    })
+  } catch (err) {
+    err.caller = 'git.isIgnored';
+    throw err
+  }
+}
+
+// @ts-check
+
 /**
  * List branches
  *
@@ -10554,6 +10615,10 @@ async function _log({
   let lastCommit;
   let isOk;
 
+  function endCommit(commit) {
+    if (isOk && filepath) commits.push(commit);
+  }
+
   while (tips.length > 0) {
     const commit = tips.pop();
 
@@ -10663,10 +10728,6 @@ async function _log({
     tips.sort((a, b) => compareAge(a.commit, b.commit));
   }
   return commits
-
-  function endCommit(commit) {
-    if (isOk && filepath) commits.push(commit);
-  }
 }
 
 // @ts-check
@@ -14077,6 +14138,7 @@ var index = {
   indexPack,
   init,
   isDescendent,
+  isIgnored,
   listBranches,
   listFiles,
   listNotes,
@@ -14113,4 +14175,4 @@ var index = {
 };
 
 export default index;
-export { Errors, STAGE, TREE, WORKDIR, add, addNote, addRemote, annotatedTag, branch, checkout, clone, commit, currentBranch, deleteBranch, deleteRef, deleteRemote, deleteTag, expandOid, expandRef, fastForward, fetch, findMergeBase, findRoot, getConfig, getConfigAll, getRemoteInfo, getRemoteInfo2, hashBlob, indexPack, init, isDescendent, listBranches, listFiles, listNotes, listRemotes, listServerRefs, listTags, log, merge, packObjects, pull, push, readBlob, readCommit, readNote, readObject, readTag, readTree, remove, removeNote, renameBranch, resetIndex, resolveRef, setConfig, status, statusMatrix, tag, version, walk, writeBlob, writeCommit, writeObject, writeRef, writeTag, writeTree };
+export { Errors, STAGE, TREE, WORKDIR, add, addNote, addRemote, annotatedTag, branch, checkout, clone, commit, currentBranch, deleteBranch, deleteRef, deleteRemote, deleteTag, expandOid, expandRef, fastForward, fetch, findMergeBase, findRoot, getConfig, getConfigAll, getRemoteInfo, getRemoteInfo2, hashBlob, indexPack, init, isDescendent, isIgnored, listBranches, listFiles, listNotes, listRemotes, listServerRefs, listTags, log, merge, packObjects, pull, push, readBlob, readCommit, readNote, readObject, readTag, readTree, remove, removeNote, renameBranch, resetIndex, resolveRef, setConfig, status, statusMatrix, tag, version, walk, writeBlob, writeCommit, writeObject, writeRef, writeTag, writeTree };