isomorphic-git 1.40.4 → 1.40.6

package/index.cjs

@@ -8320,7 +8320,7 @@ async function checkAndWriteBlob(fs, gitdir, dir, filepath, oid = null) {
     : undefined;
   let retOid = objContent ? oid : undefined;
   if (!objContent) {
-    await acquireLock$1({ fs, gitdir, currentFilepath }, async () => {
+    await acquireLock$1(currentFilepath, async () => {
       const object = stats.isSymbolicLink()
         ? await fs.readlink(currentFilepath).then(posixifyPathBuffer)
         : await fs.read(currentFilepath);
@@ -8535,7 +8535,7 @@ async function applyTreeChanges({
   });
 
   // apply the changes to work dir
-  await acquireLock$1({ fs, gitdir, dirRemoved, ops }, async () => {
+  await acquireLock$1(gitdir, async () => {
     for (const op of ops) {
       const currentFilepath = join(dir, op.filepath);
       switch (op.method) {
@@ -9572,8 +9572,8 @@ function filterCapabilities(server, client) {
 
 const pkg = {
   name: 'isomorphic-git',
-  version: '1.40.4',
-  agent: 'git/isomorphic-git@1.40.4',
+  version: '1.40.6',
+  agent: 'git/isomorphic-git@1.40.6',
 };
 
 class FIFO {
@@ -11961,11 +11961,13 @@ function formatInfoRefs(remote, prefix, symrefs, peelTags) {
         const _key = key.replace('^{}', '');
         // Peeled tags are almost always listed immediately after the original tag
         const last = refs[refs.length - 1];
-        const r = last.ref === _key ? last : refs.find(x => x.ref === _key);
-        if (r === undefined) {
-          throw new Error('I did not expect this to happen')
+        const r = last?.ref === _key ? last : refs.find(x => x.ref === _key);
+        // The tag itself can be absent when `prefix` filtered it out: the
+        // peeled name is longer, so it can match a prefix the tag does not.
+        // There is nothing to attach the peeled oid to, so drop it.
+        if (r !== undefined) {
+          r.peeled = value;
         }
-        r.peeled = value;
       }
       continue
     }
@@ -15928,7 +15930,7 @@ class GitStashManager {
     );
     const filepath = this.refLogsStashPath;
 
-    await acquireLock$1({ filepath, entry }, async () => {
+    await acquireLock$1(filepath, async () => {
       const appendTo = (await this.fs.exists(filepath))
         ? await this.fs.read(filepath, 'utf8')
         : '';
@@ -16138,7 +16140,7 @@ async function _stashDrop({ fs, dir, gitdir, refIdx = 0 }) {
   reflogEntries.splice(refIdx, 1);
 
   const stashReflogPath = stashMgr.refLogsStashPath;
-  await acquireLock$1({ reflogEntries, stashReflogPath, stashMgr }, async () => {
+  await acquireLock$1(stashReflogPath, async () => {
     if (reflogEntries.length) {
       await fs.write(
         stashReflogPath,

package/index.js

@@ -8307,7 +8307,7 @@ async function checkAndWriteBlob(fs, gitdir, dir, filepath, oid = null) {
     : undefined;
   let retOid = objContent ? oid : undefined;
   if (!objContent) {
-    await acquireLock$1({ fs, gitdir, currentFilepath }, async () => {
+    await acquireLock$1(currentFilepath, async () => {
       const object = stats.isSymbolicLink()
         ? await fs.readlink(currentFilepath).then(posixifyPathBuffer)
         : await fs.read(currentFilepath);
@@ -8522,7 +8522,7 @@ async function applyTreeChanges({
   });
 
   // apply the changes to work dir
-  await acquireLock$1({ fs, gitdir, dirRemoved, ops }, async () => {
+  await acquireLock$1(gitdir, async () => {
     for (const op of ops) {
       const currentFilepath = join(dir, op.filepath);
       switch (op.method) {
@@ -9559,8 +9559,8 @@ function filterCapabilities(server, client) {
 
 const pkg = {
   name: 'isomorphic-git',
-  version: '1.40.4',
-  agent: 'git/isomorphic-git@1.40.4',
+  version: '1.40.6',
+  agent: 'git/isomorphic-git@1.40.6',
 };
 
 class FIFO {
@@ -11948,11 +11948,13 @@ function formatInfoRefs(remote, prefix, symrefs, peelTags) {
         const _key = key.replace('^{}', '');
         // Peeled tags are almost always listed immediately after the original tag
         const last = refs[refs.length - 1];
-        const r = last.ref === _key ? last : refs.find(x => x.ref === _key);
-        if (r === undefined) {
-          throw new Error('I did not expect this to happen')
+        const r = last?.ref === _key ? last : refs.find(x => x.ref === _key);
+        // The tag itself can be absent when `prefix` filtered it out: the
+        // peeled name is longer, so it can match a prefix the tag does not.
+        // There is nothing to attach the peeled oid to, so drop it.
+        if (r !== undefined) {
+          r.peeled = value;
         }
-        r.peeled = value;
       }
       continue
     }
@@ -15915,7 +15917,7 @@ class GitStashManager {
     );
     const filepath = this.refLogsStashPath;
 
-    await acquireLock$1({ filepath, entry }, async () => {
+    await acquireLock$1(filepath, async () => {
       const appendTo = (await this.fs.exists(filepath))
         ? await this.fs.read(filepath, 'utf8')
         : '';
@@ -16125,7 +16127,7 @@ async function _stashDrop({ fs, dir, gitdir, refIdx = 0 }) {
   reflogEntries.splice(refIdx, 1);
 
   const stashReflogPath = stashMgr.refLogsStashPath;
-  await acquireLock$1({ reflogEntries, stashReflogPath, stashMgr }, async () => {
+  await acquireLock$1(stashReflogPath, async () => {
     if (reflogEntries.length) {
       await fs.write(
         stashReflogPath,