isomorphic-git 1.24.3 → 1.24.5

package/browser-tests.json

@@ -1,11 +1,8 @@
 [
-  "Chrome Headless 79.0.3945.0 (Linux x86_64)",
-  "X Firefox 115.0 (Ubuntu 0.0.0)",
-  "Edge 79.0.309.65 (Windows 10)",
-  "Safari 13.1 (Mac OS 10.15.4)",
-  "Mobile Safari 13.0 (iOS 13.0)",
-  "X Chrome 111.0.0.0 (Android 10)",
   "Chrome Headless 79.0.3945.0 (Linux x86_64)",
   "Firefox 115.0 (Ubuntu 0.0.0)",
-  "Chrome 111.0.0.0 (Android 10)"
+  "Chrome 114.0.0.0 (Android 10)",
+  "Safari 13.1 (Mac OS 10.15.4)",
+  "Edge 79.0.309.65 (Windows 10)",
+  "Mobile Safari 13.0 (iOS 13.0)"
 ]

package/index.cjs

@@ -4400,6 +4400,18 @@ async function rmRecursive(fs, filepath) {
   }
 }
 
+function isPromiseLike(obj) {
+  return isObject(obj) && isFunction(obj.then) && isFunction(obj.catch)
+}
+
+function isObject(obj) {
+  return obj && typeof obj === 'object'
+}
+
+function isFunction(obj) {
+  return typeof obj === 'function'
+}
+
 function isPromiseFs(fs) {
   const test = targetFs => {
     try {
@@ -4410,7 +4422,7 @@ function isPromiseFs(fs) {
       return e
     }
   };
-  return test(fs).constructor.name === 'Promise'
+  return isPromiseLike(test(fs))
 }
 
 // List of commands all filesystems are expected to provide. `rm` is not
@@ -7301,8 +7313,8 @@ function filterCapabilities(server, client) {
 
 const pkg = {
   name: 'isomorphic-git',
-  version: '1.24.3',
-  agent: 'git/isomorphic-git@1.24.3',
+  version: '1.24.5',
+  agent: 'git/isomorphic-git@1.24.5',
 };
 
 class FIFO {
@@ -8625,15 +8637,20 @@ async function _expandOid({ fs, cache, gitdir, oid: short }) {
   // process can acquire external ref-deltas.
   const getExternalRefDelta = oid => _readObject({ fs, cache, gitdir, oid });
 
-  const results1 = await expandOidLoose({ fs, gitdir, oid: short });
-  const results2 = await expandOidPacked({
+  const results = await expandOidLoose({ fs, gitdir, oid: short });
+  const packedOids = await expandOidPacked({
     fs,
     cache,
     gitdir,
     oid: short,
     getExternalRefDelta,
   });
-  const results = results1.concat(results2);
+  // Objects can exist in a pack file as well as loose, make sure we only get a list of unique oids.
+  for (const packedOid of packedOids) {
+    if (results.indexOf(packedOid) === -1) {
+      results.push(packedOid);
+    }
+  }
 
   if (results.length === 1) {
     return results[0]

package/index.js

@@ -4394,6 +4394,18 @@ async function rmRecursive(fs, filepath) {
   }
 }
 
+function isPromiseLike(obj) {
+  return isObject(obj) && isFunction(obj.then) && isFunction(obj.catch)
+}
+
+function isObject(obj) {
+  return obj && typeof obj === 'object'
+}
+
+function isFunction(obj) {
+  return typeof obj === 'function'
+}
+
 function isPromiseFs(fs) {
   const test = targetFs => {
     try {
@@ -4404,7 +4416,7 @@ function isPromiseFs(fs) {
       return e
     }
   };
-  return test(fs).constructor.name === 'Promise'
+  return isPromiseLike(test(fs))
 }
 
 // List of commands all filesystems are expected to provide. `rm` is not
@@ -7295,8 +7307,8 @@ function filterCapabilities(server, client) {
 
 const pkg = {
   name: 'isomorphic-git',
-  version: '1.24.3',
-  agent: 'git/isomorphic-git@1.24.3',
+  version: '1.24.5',
+  agent: 'git/isomorphic-git@1.24.5',
 };
 
 class FIFO {
@@ -8619,15 +8631,20 @@ async function _expandOid({ fs, cache, gitdir, oid: short }) {
   // process can acquire external ref-deltas.
   const getExternalRefDelta = oid => _readObject({ fs, cache, gitdir, oid });
 
-  const results1 = await expandOidLoose({ fs, gitdir, oid: short });
-  const results2 = await expandOidPacked({
+  const results = await expandOidLoose({ fs, gitdir, oid: short });
+  const packedOids = await expandOidPacked({
     fs,
     cache,
     gitdir,
     oid: short,
     getExternalRefDelta,
   });
-  const results = results1.concat(results2);
+  // Objects can exist in a pack file as well as loose, make sure we only get a list of unique oids.
+  for (const packedOid of packedOids) {
+    if (results.indexOf(packedOid) === -1) {
+      results.push(packedOid);
+    }
+  }
 
   if (results.length === 1) {
     return results[0]