isomorphic-git 1.41.7 → 1.41.9

package/README.md

@@ -109,7 +109,7 @@ import git from 'isomorphic-git'
 // or
 import * as git from 'isomorphic-git'
 // or
-import {plugins, clone, commit, push} from 'isomorphic-git'
+import {add, clone, commit, push} from 'isomorphic-git'
 ```
 
 View the full [Getting Started guide](https://isomorphic-git.github.io/docs/quickstart.html) on the docs website.

package/index.cjs

@@ -2365,6 +2365,38 @@ class GitRefManager {
     throw new NotFoundError(ref)
   }
 
+  /**
+   * Checks whether a ref names the branch HEAD points at in a repository where
+   * that branch has no commits yet.
+   *
+   * A repository created by `git init` has a HEAD pointing at a branch that
+   * does not exist on disk. Resolving that branch fails the same way resolving
+   * a misspelled ref does, so callers that want to treat the two differently
+   * need this to tell them apart.
+   *
+   * @param {Object} args
+   * @param {FSClient} args.fs - A file system implementation.
+   * @param {string} [args.gitdir=join(dir, '.git')] - [required] The [git directory](dir-vs-gitdir.md) path
+   * @param {string} args.ref - The ref to check.
+   * @returns {Promise<boolean>} - True if the ref names an unborn branch.
+   */
+  static async isUnbornBranch({ fs, gitdir, ref }) {
+    let target;
+    try {
+      // depth 2 stops at the symbolic target instead of following it to an oid.
+      target = await GitRefManager.resolve({
+        fs,
+        gitdir,
+        ref: 'HEAD',
+        depth: 2,
+      });
+    } catch (_) {
+      return false
+    }
+    if (!target.startsWith('refs/heads/')) return false
+    return ref === 'HEAD' || refpaths(ref).includes(target)
+  }
+
   /**
    * Checks if a ref exists.
    *
@@ -4544,9 +4576,16 @@ class GitWalkerRepo {
       try {
         oid = await GitRefManager.resolve({ fs, gitdir, ref });
       } catch (e) {
-        if (e instanceof NotFoundError) {
-          // Handle fresh branches with no commits
+        // Only a branch that has no commits yet gets the empty tree. Anything
+        // else that fails to resolve is a ref the caller got wrong, and
+        // swallowing it here would walk an empty tree instead of saying so.
+        if (
+          e instanceof NotFoundError &&
+          (await GitRefManager.isUnbornBranch({ fs, gitdir, ref }))
+        ) {
           oid = '4b825dc642cb6eb9a060e54bf8d69288fbee4904';
+        } else {
+          throw e
         }
       }
       const tree = await resolveTree({ fs, cache: this.cache, gitdir, oid });
@@ -7084,11 +7123,17 @@ const worthWalking = (filepath, root) => {
   if (filepath === '.' || root == null || root.length === 0 || root === '.') {
     return true
   }
-  if (root.length >= filepath.length) {
-    return root.startsWith(filepath)
-  } else {
-    return filepath.startsWith(root)
+  // A shared prefix only counts when it lands on a path component boundary,
+  // otherwise the root 'src' would also pull in 'src2/a.js' and 'srcfoo.txt'.
+  const base = root.endsWith('/') ? root.slice(0, -1) : root;
+  if (base === '.') {
+    return true
+  }
+  if (base.length >= filepath.length) {
+    // Keep walking while filepath is still an ancestor of the wanted root.
+    return base === filepath || base.startsWith(`${filepath}/`)
   }
+  return filepath.startsWith(`${base}/`)
 };
 
 // @ts-check
@@ -9728,8 +9773,8 @@ function filterCapabilities(server, client) {
 
 const pkg = {
   name: 'isomorphic-git',
-  version: '1.41.7',
-  agent: 'git/isomorphic-git@1.41.7',
+  version: '1.41.9',
+  agent: 'git/isomorphic-git@1.41.9',
 };
 
 class FIFO {

package/index.js

@@ -2358,6 +2358,38 @@ class GitRefManager {
     throw new NotFoundError(ref)
   }
 
+  /**
+   * Checks whether a ref names the branch HEAD points at in a repository where
+   * that branch has no commits yet.
+   *
+   * A repository created by `git init` has a HEAD pointing at a branch that
+   * does not exist on disk. Resolving that branch fails the same way resolving
+   * a misspelled ref does, so callers that want to treat the two differently
+   * need this to tell them apart.
+   *
+   * @param {Object} args
+   * @param {FSClient} args.fs - A file system implementation.
+   * @param {string} [args.gitdir=join(dir, '.git')] - [required] The [git directory](dir-vs-gitdir.md) path
+   * @param {string} args.ref - The ref to check.
+   * @returns {Promise<boolean>} - True if the ref names an unborn branch.
+   */
+  static async isUnbornBranch({ fs, gitdir, ref }) {
+    let target;
+    try {
+      // depth 2 stops at the symbolic target instead of following it to an oid.
+      target = await GitRefManager.resolve({
+        fs,
+        gitdir,
+        ref: 'HEAD',
+        depth: 2,
+      });
+    } catch (_) {
+      return false
+    }
+    if (!target.startsWith('refs/heads/')) return false
+    return ref === 'HEAD' || refpaths(ref).includes(target)
+  }
+
   /**
    * Checks if a ref exists.
    *
@@ -4531,9 +4563,16 @@ class GitWalkerRepo {
       try {
         oid = await GitRefManager.resolve({ fs, gitdir, ref });
       } catch (e) {
-        if (e instanceof NotFoundError) {
-          // Handle fresh branches with no commits
+        // Only a branch that has no commits yet gets the empty tree. Anything
+        // else that fails to resolve is a ref the caller got wrong, and
+        // swallowing it here would walk an empty tree instead of saying so.
+        if (
+          e instanceof NotFoundError &&
+          (await GitRefManager.isUnbornBranch({ fs, gitdir, ref }))
+        ) {
           oid = '4b825dc642cb6eb9a060e54bf8d69288fbee4904';
+        } else {
+          throw e
         }
       }
       const tree = await resolveTree({ fs, cache: this.cache, gitdir, oid });
@@ -7071,11 +7110,17 @@ const worthWalking = (filepath, root) => {
   if (filepath === '.' || root == null || root.length === 0 || root === '.') {
     return true
   }
-  if (root.length >= filepath.length) {
-    return root.startsWith(filepath)
-  } else {
-    return filepath.startsWith(root)
+  // A shared prefix only counts when it lands on a path component boundary,
+  // otherwise the root 'src' would also pull in 'src2/a.js' and 'srcfoo.txt'.
+  const base = root.endsWith('/') ? root.slice(0, -1) : root;
+  if (base === '.') {
+    return true
+  }
+  if (base.length >= filepath.length) {
+    // Keep walking while filepath is still an ancestor of the wanted root.
+    return base === filepath || base.startsWith(`${filepath}/`)
   }
+  return filepath.startsWith(`${base}/`)
 };
 
 // @ts-check
@@ -9715,8 +9760,8 @@ function filterCapabilities(server, client) {
 
 const pkg = {
   name: 'isomorphic-git',
-  version: '1.41.7',
-  agent: 'git/isomorphic-git@1.41.7',
+  version: '1.41.9',
+  agent: 'git/isomorphic-git@1.41.9',
 };
 
 class FIFO {